May 2017 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Do not bother to check identity fixup support.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: fca7f78ea0d6fdc51afced43a672a6802387ccea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca7f78ea0d6fdc51afced43a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:05 2017 +0200 wined3d: Do not bother to check identity fixup support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 912511b..cc58042 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3350,6 +3350,9 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) continue; + if (is_identity_fixup(format->color_fixup)) + continue; + TRACE("Checking support for fixup:\n"); dump_color_fixup_desc(format->color_fixup); if (!adapter->shader_backend->shader_color_fixup_supported(format->color_fixup)

1 0

Józef Kucia : wined3d: Remove outdated comment in CheckRenderTargetCapability().
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: f20bdd8deed0e43a40db4f95096f1cc6f3f89af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20bdd8deed0e43a40db4f950… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:06 2017 +0200 wined3d: Remove outdated comment in CheckRenderTargetCapability(). The WINED3DFMT_FLAG_RENDERTARGET flag is cleared in init_format_fbo_compat_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b5ef8a..e6cefbd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5140,6 +5140,8 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* Filter out non-RT formats */ if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + return TRUE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { const struct wined3d_pixel_format *cfgs = adapter->cfgs; @@ -5169,12 +5171,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, } } } - else if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - /* For now return TRUE for FBOs until we have some proper checks. - * Note that this function will only be called when the format is around for texturing. */ - return TRUE; - } return FALSE; }

1 0

Józef Kucia : d3d11/tests: Prefer D3D11 enum values.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 7f456cb3e113c4545d7ece8599df5650f71453a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f456cb3e113c4545d7ece859… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:07 2017 +0200 d3d11/tests: Prefer D3D11 enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 431db44..b160977 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2605,7 +2605,7 @@ static void test_create_buffer(void) } memset(&desc, 0, sizeof(desc)); - desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; for (i = 0; i <= 32; ++i) { desc.ByteWidth = i;

1 0

Stefan Dösinger : msvcp140: Implement _To_wide.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 7c5e060be9c390cee20fa1e8fef91f9e74701543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5e060be9c390cee20fa1e8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 26 14:52:08 2017 +0200 msvcp140: Implement _To_wide. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 10 ++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f13ec56..284f674 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3732,7 +3732,7 @@ @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield @ stub _To_byte -@ stub _To_wide +@ cdecl _To_wide(str ptr) @ cdecl _Tolower(long ptr) _Tolower @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index c964613..f3dd4a0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -18,6 +18,10 @@ #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + #include "wine/test.h" #include "winbase.h" @@ -148,6 +152,8 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -209,6 +215,8 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_To_wide, "_To_wide"); + init_thiscall_thunk(); return TRUE; } @@ -461,6 +469,52 @@ static void test_chore(void) p__Release_chore(&chore); } +static void test_to_wide(void) +{ + /* öäüß€Ÿ.A.B in cp1252, the two . are an undefined value and delete. + * With a different system codepage it will produce different results, so do not hardcode the + * expected output but convert it with MultiByteToWideChar. */ + static const char special_input[] = {0xf6, 0xe4, 0xfc, 0xdf, 0x80, 0x9f, 0x81, 0x41, 0x7f, 0x42, 0}; + static const char *tests[] = {"Testtest", special_input}; + WCHAR dst[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + WCHAR compare[MAX_PATH + 4] = {'A', 'B', 'C', 0, 'X', 'X', 'X', 'X', 'X', 'X', 'X'}; + int ret, expected; + unsigned int i; + char longstr[MAX_PATH + 3]; + + ret = p_To_wide(NULL, NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(tests[0], NULL); + ok(!ret, "Got unexpected result %d\n", ret); + ret = p_To_wide(NULL, dst); + ok(!ret, "Got unexpected result %d\n", ret); + ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", wine_dbgstr_w(dst)); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + ret = p_To_wide(tests[i], dst); + expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare)); + ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", + wine_dbgstr_w(dst), i); + } + + /* Output length is limited to MAX_PATH.*/ + for (i = MAX_PATH - 2; i < MAX_PATH + 2; ++i) + { + memset(longstr, 'A', sizeof(longstr)); + longstr[i] = 0; + memset(dst, 0xff, sizeof(dst)); + memset(compare, 0xff, sizeof(compare)); + + ret = p_To_wide(longstr, dst); + expected = MultiByteToWideChar(CP_ACP, 0, longstr, -1, compare, MAX_PATH); + ok(ret == expected, "Got unexpected result %d, expected %d, length %u\n", ret, expected, i); + ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, length %u\n", + wine_dbgstr_w(dst), i); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -470,5 +524,6 @@ START_TEST(msvcp140) test__ContextCallback(); test__TaskEventLogger(); test_chore(); + test_to_wide(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index d2fce47..8847ac2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -11224,6 +11224,16 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s } #endif +int __cdecl _To_wide(const char *src, wchar_t *dst) +{ + TRACE("(%s %p)\n", debugstr_a(src), dst); + + if (!src || !dst) + return 0; + + return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); +} + DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base(a)std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@")

1 0

Józef Kucia : wined3d: Fix FFP lighting.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 7955ce42fc03bfc94104fbc66110ae9eacdd43f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7955ce42fc03bfc94104fbc66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:31 2017 +0200 wined3d: Fix FFP lighting. Fixes a regression introduced by commit c329ee5673c5c9864611d9276e892abdf1d1a852. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5f3af03..27116d0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8265,7 +8265,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; } shader_addline(buffer, "dir = normalize(dir);\n"); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); shader_addline(buffer, "}\n"); } @@ -8306,7 +8306,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "}\n"); continue; } - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); shader_addline(buffer, "}\n"); } @@ -8317,7 +8317,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; shader_addline(buffer, "att = 1.0;\n"); shader_addline(buffer, "dir = normalize(ffp_light[%u].direction.xyz);\n", idx); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); } for (i = 0; i < settings->parallel_point_light_count; ++i, ++idx) @@ -8327,7 +8327,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; shader_addline(buffer, "att = 1.0;\n"); shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", idx); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); } shader_addline(buffer, "ffp_varying_diffuse.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n",

1 0

Michael Müller : wined3d: Don' t leak free_so_statistics_queries on device destruction.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 93c349c9c77fd66b90145677dfe102b7552fc097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c349c9c77fd66b90145677d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon May 29 10:53:32 2017 +0200 wined3d: Don't leak free_so_statistics_queries on device destruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 49b9186..8ab0e10 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1336,6 +1336,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) checkGLcall("context cleanup"); } + HeapFree(GetProcessHeap(), 0, context->free_so_statistics_queries); HeapFree(GetProcessHeap(), 0, context->free_timestamp_queries); HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries);

1 0

Józef Kucia : wined3d: Bind frag data location for core context draw quad shader.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0d3dc7c971dd6ab77eda266f41048caca07300b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3dc7c971dd6ab77eda266f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:33 2017 +0200 wined3d: Bind frag data location for core context draw quad shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cc58042..4694195 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2155,6 +2155,9 @@ static void draw_test_quad(struct wined3d_caps_gl_ctx *ctx, const struct wined3d GL_EXTCALL(glBindAttribLocation(ctx->test_program_id, 0, "pos")); GL_EXTCALL(glBindAttribLocation(ctx->test_program_id, 1, "color")); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + GL_EXTCALL(glBindFragDataLocation(ctx->test_program_id, 0, "fragment_color")); + GL_EXTCALL(glCompileShader(vs_id)); print_glsl_info_log(gl_info, vs_id, FALSE); GL_EXTCALL(glCompileShader(fs_id));

1 0

Józef Kucia : wined3d: Use ARRAY_SIZE() in init_format_filter_info().
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: cc84b252ff380b937cba9b41644c125ab01f5775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc84b252ff380b937cba9b416… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:35 2017 +0200 wined3d: Use ARRAY_SIZE() in init_format_filter_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4694195..5c03c79 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3107,9 +3107,9 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 filtered = FALSE; } - if(filtered) + if (filtered) { - for(i = 0; i < (sizeof(fmts16) / sizeof(*fmts16)); i++) + for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); format_set_flag(&gl_info->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); @@ -3118,14 +3118,14 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 return; } - for(i = 0; i < (sizeof(fmts16) / sizeof(*fmts16)); i++) + for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); format = &gl_info->formats[fmt_idx]; if (!format->glInternal) continue; /* Not supported by GL */ filtered = check_filter(gl_info, gl_info->formats[fmt_idx].glInternal); - if(filtered) + if (filtered) { TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); format_set_flag(format, WINED3DFMT_FLAG_FILTERING);

1 0

Józef Kucia : wined3d: Use ARRAY_SIZE() in wined3d_format_get_color_key_conversion().
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 0d9ce15ff6559f3595de8f5c0024821d9097ef6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9ce15ff6559f3595de8f5c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:36 2017 +0200 wined3d: Use ARRAY_SIZE() in wined3d_format_get_color_key_conversion(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c03c79..afe35fa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1032,7 +1032,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers if (need_alpha_ck && (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY)) { - for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) + for (i = 0; i < ARRAY_SIZE(color_key_info); ++i) { if (color_key_info[i].src_format == format->id) return &color_key_info[i].conversion;

1 0

Austin English : d3dx9_34: Sort specfile.
by Alexandre Julliard 30 May '17

30 May '17

Module: wine Branch: master Commit: 18306210ee656bdf672d5700bed74517bb7cd114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18306210ee656bdf672d5700b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:10 2017 -0500 d3dx9_34: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_34/d3dx9_34.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index 975a2c4..2f51ece 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -74,18 +74,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -120,6 +120,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -138,7 +139,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -174,11 +174,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -253,23 +253,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -282,12 +265,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0