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

Austin English : d3dx9_34: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

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

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

May 30, 2017

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: Fix FFP lighting.
by Alexandre Julliard May 30, 2017

May 30, 2017

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

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

May 30, 2017

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

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

May 30, 2017

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

Stefan Dösinger : msvcp140: Implement _To_wide.
by Alexandre Julliard May 30, 2017

May 30, 2017

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: Trace color fixup checks in apply_format_fixups().
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 229d4aa7bc23beab02a7b1f7f20187069dcdeed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d4aa7bc23beab02a7b1f7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:04 2017 +0200 wined3d: Trace color fixup checks in apply_format_fixups(). 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/arb_program_shader.c | 15 +-------------- dlls/wined3d/ati_fragment_shader.c | 17 ++--------------- dlls/wined3d/glsl_shader.c | 15 +-------------- dlls/wined3d/nvidia_texture_shader.c | 15 +-------------- dlls/wined3d/state.c | 15 +-------------- dlls/wined3d/utils.c | 9 +++++++++ 6 files changed, 15 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c9e5880..612a51b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4977,21 +4977,8 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for color_fixup:\n"); - dump_color_fixup_desc(fixup); - } - /* We support everything except complex conversions. */ - if (!is_complex_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + return !is_complex_fixup(fixup); } static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index c9af8e7..0fca3e6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1352,22 +1352,9 @@ static void atifs_free(struct wined3d_device *device) static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - /* We only support sign fixup of the first two channels. */ - if (is_identity_fixup(fixup) || is_same_fixup(fixup, color_fixup_rg) - || is_same_fixup(fixup, color_fixup_rgl) || is_same_fixup(fixup, color_fixup_rgba)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + return is_identity_fixup(fixup) || is_same_fixup(fixup, color_fixup_rg) + || is_same_fixup(fixup, color_fixup_rgl) || is_same_fixup(fixup, color_fixup_rgba); } static BOOL atifs_alloc_context_data(struct wined3d_context *context) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6a405ba..5f3af03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10589,21 +10589,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - /* We support everything except YUV conversions. */ - if (!is_complex_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + return !is_complex_fixup(fixup); } static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index d329656..9d3a3a1 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -761,21 +761,8 @@ static void nvrc_fragment_free(struct wined3d_device *device) {} static BOOL nvts_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - /* We only support identity conversions. */ - if (is_identity_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + return is_identity_fixup(fixup); } static const struct StateEntryTemplate nvrc_fragmentstate_template[] = diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a59e913..bc5b098 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5845,21 +5845,8 @@ static DWORD ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - /* We only support identity conversions. */ - if (is_identity_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + return is_identity_fixup(fixup); } static BOOL ffp_none_context_alloc(struct wined3d_context *context) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bf7f916..912511b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3350,9 +3350,18 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) 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) || !adapter->fragment_pipe->color_fixup_supported(format->color_fixup)) + { + TRACE("[FAILED]\n"); format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); + } + else + { + TRACE("[OK]\n"); + } } /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers

1 0

Józef Kucia : wined3d: Introduce query operation to destroy queries.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: be20ddc38b3f9e101460f5f8f04015b148d3e13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be20ddc38b3f9e101460f5f8f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:03 2017 +0200 wined3d: Introduce query operation to destroy queries. 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/buffer.c | 12 +++--- dlls/wined3d/query.c | 92 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ab2fea3..5740d65 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -187,7 +187,8 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w if (buffer->query) { - wined3d_event_query_destroy(buffer->query); + struct wined3d_query *query = &buffer->query->query; + query->query_ops->query_destroy(query); buffer->query = NULL; } buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; @@ -827,7 +828,7 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st return; } - if(!This->query) + if (!This->query) { TRACE("Creating event query for buffer %p\n", This); @@ -850,7 +851,7 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st } TRACE("Synchronizing buffer %p\n", This); ret = wined3d_event_query_finish(This->query, This->resource.device); - switch(ret) + switch (ret) { case WINED3D_EVENT_QUERY_NOT_STARTED: case WINED3D_EVENT_QUERY_OK: @@ -867,9 +868,10 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st } drop_query: - if(This->query) + if (This->query) { - wined3d_event_query_destroy(This->query); + struct wined3d_query *query = &This->query->query; + query->query_ops->query_destroy(query); This->query = NULL; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 28db6be..5587113 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -66,12 +66,6 @@ BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } -void wined3d_event_query_destroy(struct wined3d_event_query *query) -{ - if (query->context) context_free_event_query(query); - HeapFree(GetProcessHeap(), 0, query); -} - static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, const struct wined3d_device *device, DWORD flags) { @@ -274,45 +268,7 @@ static void wined3d_query_destroy_object(void *object) * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this * context, and (still) leaking the actual query. */ - if (query->type == WINED3D_QUERY_TYPE_EVENT) - { - wined3d_event_query_destroy(wined3d_event_query_from_query(query)); - } - else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) - { - struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - - if (oq->context) - context_free_occlusion_query(oq); - HeapFree(GetProcessHeap(), 0, oq); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP) - { - struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - - if (tq->context) - context_free_timestamp_query(tq); - HeapFree(GetProcessHeap(), 0, tq); - } - else if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT - || query->type == WINED3D_QUERY_TYPE_TIMESTAMP_FREQ) - { - HeapFree(GetProcessHeap(), 0, query); - } - else if (query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 - || query->type == WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) - { - struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); - if (pq->context) - context_free_so_statistics_query(pq); - HeapFree(GetProcessHeap(), 0, pq); - } - else - { - ERR("Query %p has invalid type %#x.\n", query, query->type); - } + query->query_ops->query_destroy(query); } ULONG CDECL wined3d_query_decref(struct wined3d_query *query) @@ -773,10 +729,20 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D return poll; } +static void wined3d_event_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_event_query *event_query = wined3d_event_query_from_query(query); + + if (event_query->context) + context_free_event_query(event_query); + HeapFree(GetProcessHeap(), 0, event_query); +} + static const struct wined3d_query_ops event_query_ops = { wined3d_event_query_ops_poll, wined3d_event_query_ops_issue, + wined3d_event_query_ops_destroy, }; static HRESULT wined3d_event_query_create(struct wined3d_device *device, @@ -807,10 +773,20 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_occlusion_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); + + if (oq->context) + context_free_occlusion_query(oq); + HeapFree(GetProcessHeap(), 0, oq); +} + static const struct wined3d_query_ops occlusion_query_ops = { wined3d_occlusion_query_ops_poll, wined3d_occlusion_query_ops_issue, + wined3d_occlusion_query_ops_destroy, }; static HRESULT wined3d_occlusion_query_create(struct wined3d_device *device, @@ -841,10 +817,20 @@ static HRESULT wined3d_occlusion_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_timestamp_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); + + if (tq->context) + context_free_timestamp_query(tq); + HeapFree(GetProcessHeap(), 0, tq); +} + static const struct wined3d_query_ops timestamp_query_ops = { wined3d_timestamp_query_ops_poll, wined3d_timestamp_query_ops_issue, + wined3d_timestamp_query_ops_destroy, }; static HRESULT wined3d_timestamp_query_create(struct wined3d_device *device, @@ -875,10 +861,16 @@ static HRESULT wined3d_timestamp_query_create(struct wined3d_device *device, return WINED3D_OK; } +static void wined3d_timestamp_disjoint_query_ops_destroy(struct wined3d_query *query) +{ + HeapFree(GetProcessHeap(), 0, query); +} + static const struct wined3d_query_ops timestamp_disjoint_query_ops = { wined3d_timestamp_disjoint_query_ops_poll, wined3d_timestamp_disjoint_query_ops_issue, + wined3d_timestamp_disjoint_query_ops_destroy, }; static HRESULT wined3d_timestamp_disjoint_query_create(struct wined3d_device *device, @@ -921,10 +913,20 @@ static HRESULT wined3d_timestamp_disjoint_query_create(struct wined3d_device *de return WINED3D_OK; } +static void wined3d_so_statistics_query_ops_destroy(struct wined3d_query *query) +{ + struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); + + if (pq->context) + context_free_so_statistics_query(pq); + HeapFree(GetProcessHeap(), 0, pq); +} + static const struct wined3d_query_ops so_statistics_query_ops = { wined3d_so_statistics_query_ops_poll, wined3d_so_statistics_query_ops_issue, + wined3d_so_statistics_query_ops_destroy, }; static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6139c67..1810985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1621,6 +1621,7 @@ struct wined3d_query_ops { BOOL (*query_poll)(struct wined3d_query *query, DWORD flags); BOOL (*query_issue)(struct wined3d_query *query, DWORD flags); + void (*query_destroy)(struct wined3d_query *query); }; struct wined3d_query @@ -1665,7 +1666,6 @@ enum wined3d_event_query_result WINED3D_EVENT_QUERY_ERROR }; -void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Require just specific OpenGL extensions and SM4 support for SM5.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 0a923d523360935d318d30b5ec9a02bb53c5e702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a923d523360935d318d30b5e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:02 2017 +0200 wined3d: Require just specific OpenGL extensions and SM4 support for SM5. 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 | 2 -- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++---------------- dlls/wined3d/wined3d_gl.h | 1 - 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7273d6c..6b5ef8a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4012,8 +4012,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; - if (gl_version >= MAKEDWORD_VERSION(4, 3)) - gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; /* All the points are actually point sprites in core contexts, the APIs from * ARB_point_sprite are not supported anymore. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 73ab7a6..6a405ba 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10511,15 +10511,15 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) checkGLcall("GL_PROGRAM_POINT_SIZE"); } -static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *gl_info) { - unsigned int shader_model; + BOOL shader_model_4 = gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) + && gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_SAMPLER_OBJECTS] + && gl_info->supported[ARB_SHADER_BIT_ENCODING] + && gl_info->supported[ARB_TEXTURE_SWIZZLE]; - /* FIXME: Check for the specific extensions required for SM5 support - * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as - * soon as we introduce them, adjusting the GL / GLSL version checks - * accordingly. */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] + if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] @@ -10530,17 +10530,23 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_TESSELLATION_SHADER] && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) - shader_model = 5; - else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] - && gl_info->supported[ARB_TEXTURE_SWIZZLE]) - shader_model = 4; + return 5; + + if (shader_model_4) + return 4; + /* Support for texldd and texldl instructions in pixel shaders is required * for SM3. */ - else if (shader_glsl_has_core_grad(gl_info) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) - shader_model = 3; - else - shader_model = 2; + if (shader_glsl_has_core_grad(gl_info) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + return 3; + + return 2; +} + +static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +{ + unsigned int shader_model = shader_glsl_get_shader_model(gl_info); + TRACE("Shader model %u.\n", shader_model); caps->vs_version = min(wined3d_settings.max_sm_vs, shader_model); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 34599fd..3806869 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -206,7 +206,6 @@ enum wined3d_gl_extension WINED3D_GL_PRIMITIVE_QUERY, WINED3D_GL_VERSION_2_0, WINED3D_GL_VERSION_3_2, - WINED3D_GL_VERSION_4_3, WINED3D_GLSL_130, WINED3D_GL_EXT_COUNT,

1 0

Austin English : d3dx9_35: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 661e81de6229373cb67a3419a57e633b4c13a48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=661e81de6229373cb67a3419a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:11 2017 -0500 d3dx9_35: 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_35/d3dx9_35.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index 975a2c4..2f51ece 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.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