November 2012 - Wine-Commits

Dmitry Timoshkov : gdiplus: Store transformation matrix directly in the objects.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 39ec8ce67e92b856f1b8859cf4e4607d7ae0230f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ec8ce67e92b856f1b8859cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 8 11:11:59 2012 +0800 gdiplus: Store transformation matrix directly in the objects. --- dlls/gdiplus/brush.c | 55 +++++++++++++--------------------------- dlls/gdiplus/gdiplus_private.h | 4 +- dlls/gdiplus/graphics.c | 15 +++-------- 3 files changed, 24 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39ec8ce67e92b856f1b88…

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing ps uniform locations.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 02250bb1bd37a1d5be823684808969eaf9ef413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02250bb1bd37a1d5be8236848… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:16 2012 +0100 wined3d: Introduce a separate function for initializing ps uniform locations. --- dlls/wined3d/glsl_shader.c | 74 +++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e5383b..dc0e328 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4719,6 +4719,40 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "posFixup")); } +static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, + GLhandleARB program_id, struct glsl_ps_program *ps) +{ + unsigned int i; + char name[32]; + + ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, + sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); + for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + { + snprintf(name, sizeof(name), "ps_c[%u]", i); + ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + snprintf(name, sizeof(name), "ps_i[%u]", i); + ps->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_TEXTURES; ++i) + { + snprintf(name, sizeof(name), "bumpenv_mat%u", i); + ps->bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + snprintf(name, sizeof(name), "bumpenv_lum_scale%u", i); + ps->bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + snprintf(name, sizeof(name), "bumpenv_lum_offset%u", i); + ps->bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + ps->np2_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "ps_samplerNP2Fixup")); + ps->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "ycorrection")); +} + /** Sets the GLSL program ID for the given pixel and vertex shader combination. * It sets the programId on the current StateBlock (because it should be called * inside of the DrawPrimitive() part of the render loop). @@ -4742,7 +4776,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GLhandleARB programId = 0; GLhandleARB reorder_shader_id = 0; unsigned int i; - char glsl_name[10]; struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; GLhandleARB vs_id, ps_id; @@ -4847,44 +4880,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, shader_glsl_validate_link(gl_info, programId); shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - - entry->ps.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, - sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "ps_c[%u]", i); - entry->ps.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - for (i = 0; i < MAX_CONST_I; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "ps_i[%u]", i); - entry->ps.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - - if (pshader) - { - char name[32]; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - sprintf(name, "bumpenv_mat%u", i); - entry->ps.bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "bumpenv_lum_scale%u", i); - entry->ps.bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "bumpenv_lum_offset%u", i); - entry->ps.bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - } - - if (ps_compile_args.np2_fixup) - { - if (entry->ps.np2_fixup_info) - entry->ps.np2_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ps_samplerNP2Fixup")); - else - FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found.\n"); - } - } - - entry->ps.ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3

1 0

Detlef Riekenberg : mstask/tests: Add tests for SetTargetComputer.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 0c8dc0090b0166ab17cd1b84fdd511cab9086d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8dc0090b0166ab17cd1b84f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 8 00:12:48 2012 +0100 mstask/tests: Add tests for SetTargetComputer. --- dlls/mstask/tests/Makefile.in | 2 +- dlls/mstask/tests/task_scheduler.c | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index ffb66a8..1c0345d 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mstask.dll -IMPORTS = ole32 +IMPORTS = ole32 user32 C_SRCS = \ task.c \ diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 98556be..576d2d60 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -28,6 +28,8 @@ static ITaskScheduler *test_task_scheduler; +static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + static void test_NewWorkItem(void) { HRESULT hres; @@ -134,11 +136,80 @@ static void test_GetTargetComputer(void) return; } +static void test_SetTargetComputer(void) +{ + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + WCHAR *oldname = NULL; + WCHAR *name = NULL; + HRESULT hres; + + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (!GetComputerNameW(buffer + 2, &len)) + return; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler. Skipping tests.\n"); + return; + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok(hres == S_OK, "got 0x%x and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); + + /* NULL is an alias for the local computer */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, NULL); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* The name must be valid */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, does_not_existW); + ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%x (expected 0x80070035)\n", hres); + /* the name of the target computer is unchanged */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* the two backslash are optional */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* the case is ignored */ + CharUpperW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + CharLowerW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* cleanup */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + CoTaskMemFree(oldname); + ITaskScheduler_Release(test_task_scheduler); + return; +} + + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); test_GetTargetComputer(); + test_SetTargetComputer(); CoUninitialize(); }

1 0

André Hentschel : start: Fix mask for creation flags ( coverity).
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 76bc1d76a55f9448a90dfef421dbd39b185ceb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc1d76a55f9448a90dfef42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:18:57 2012 +0100 start: Fix mask for creation flags (coverity). --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index f3d934e..f1cb26a 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -247,7 +247,7 @@ int wmain (int argc, WCHAR *argv[]) sei.lpDirectory = argv[++i]; } else if (is_option(argv[i], bW)) { - creation_flags &= !CREATE_NEW_CONSOLE; + creation_flags &= ~CREATE_NEW_CONSOLE; } else if (argv[i][0] == '/' && (argv[i][1] == 'i' || argv[i][1] == 'I')) { TRACE("/i is ignored\n"); /* FIXME */

1 0

André Hentschel : winmm: Mark up fallthrough switch case (coverity).
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 126fded4a4a1340fc2d729591625a2e295c136e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126fded4a4a1340fc2d729591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:08 2012 +0100 winmm: Mark up fallthrough switch case (coverity). --- dlls/winmm/winmm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 890a3f0..aecb9cf 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1406,6 +1406,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm switch (lpMMT->wType) { default: FIXME("Unsupported time type %x\n", lpMMT->wType); + /* fall through */ case TIME_BYTES: case TIME_SAMPLES: lpMMT->wType = TIME_MS;

1 0

André Hentschel : xcopy: Fix indentation of a break ( coverity).
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 69f2ac0d52df2930da8f89ea0bda005e73b8653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f2ac0d52df2930da8f89ea0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:27 2012 +0100 xcopy: Fix indentation of a break (coverity). --- programs/xcopy/xcopy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index ffd2c56..7a68831 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -821,7 +821,8 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, break; case '-': if (toupper(word[2])=='Y') - flags &= ~OPT_NOPROMPT; break; + flags &= ~OPT_NOPROMPT; + break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); rc = RC_HELP; goto out;

1 0

Hans Leidekker : xpssvcs: Add stub dll.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: dff501236aad78562131d9d69ed31fa1fad2dc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff501236aad78562131d9d69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 8 13:18:25 2012 +0100 xpssvcs: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/xpssvcs/Makefile.in | 6 ++++++ dlls/xpssvcs/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/xpssvcs/xpssvcs.spec | 9 +++++++++ 5 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 991026d..0f55611 100755 --- a/configure +++ b/configure @@ -15810,6 +15810,7 @@ wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_dll xpsprint enable_xpsprint +wine_fn_config_dll xpssvcs enable_xpssvcs wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev diff --git a/configure.ac b/configure.ac index 6a63e6e..cc32c24 100644 --- a/configure.ac +++ b/configure.ac @@ -3076,6 +3076,7 @@ WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_DLL(xpsprint) +WINE_CONFIG_DLL(xpssvcs) WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in new file mode 100644 index 0000000..206cbcb --- /dev/null +++ b/dlls/xpssvcs/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xpssvcs.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xpssvcs/main.c b/dlls/xpssvcs/main.c new file mode 100644 index 0000000..98e4643 --- /dev/null +++ b/dlls/xpssvcs/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/xpssvcs/xpssvcs.spec b/dlls/xpssvcs/xpssvcs.spec new file mode 100644 index 0000000..335259e --- /dev/null +++ b/dlls/xpssvcs/xpssvcs.spec @@ -0,0 +1,9 @@ +@ stub CreateContainerConsumer +@ stub CreateContainerProducer +@ stub CreateReachPackageReceiver +@ stub CreateReachPackageSender +@ stub CreateSeekableBuffer +@ stub CreateStreamReceiverOnFileHandle +@ stub CreateStreamSenderOnFileHandle +@ stub CreateStreamSenderOnIStream +@ stub DDLogHelper

1 0

Sam Edwards : opengl32: Apply correct normals to text rendered with wglUseFontOutlines.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 001726fcbda1765cf9226cf6e98d85f5ea48b282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001726fcbda1765cf9226cf6e… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Wed Nov 7 16:06:09 2012 -0700 opengl32: Apply correct normals to text rendered with wglUseFontOutlines. --- dlls/opengl32/wgl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d8719ad..798a0e5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1215,6 +1215,7 @@ typedef void (WINAPI *_GLUfuncptr)(void); static GLUtesselator * (WINAPI *pgluNewTess)(void); static void (WINAPI *pgluDeleteTess)(GLUtesselator *tess); +static void (WINAPI *pgluTessNormal)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z); static void (WINAPI *pgluTessBeginPolygon)(GLUtesselator *tess, void *polygon_data); static void (WINAPI *pgluTessEndPolygon)(GLUtesselator *tess); static void (WINAPI *pgluTessCallback)(GLUtesselator *tess, GLenum which, _GLUfuncptr fn); @@ -1242,6 +1243,7 @@ static HMODULE load_libglu(void) LOAD_FUNCPTR(gluNewTess); LOAD_FUNCPTR(gluDeleteTess); LOAD_FUNCPTR(gluTessBeginContour); + LOAD_FUNCPTR(gluTessNormal); LOAD_FUNCPTR(gluTessBeginPolygon); LOAD_FUNCPTR(gluTessCallback); LOAD_FUNCPTR(gluTessEndContour); @@ -1442,9 +1444,13 @@ static BOOL wglUseFontOutlines_common(HDC hdc, } funcs->gl.p_glNewList(listBase++, GL_COMPILE); - funcs->gl.p_glFrontFace(GL_CW); + funcs->gl.p_glFrontFace(GL_CCW); if(format == WGL_FONT_POLYGONS) + { + funcs->gl.p_glNormal3d(0.0, 0.0, 1.0); + pgluTessNormal(tess, 0, 0, 1); pgluTessBeginPolygon(tess, NULL); + } while(!vertices) {

1 0

Henri Verbeet : wined3d: Use the correct RGTC constant in format_texture_info.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: b42e02ce9b2979763032d600e1518afccbf4df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42e02ce9b2979763032d600e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:14 2012 +0100 wined3d: Use the correct RGTC constant in format_texture_info. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 67cebbe..0624694 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -864,7 +864,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ATI_TEXTURE_COMPRESSION_3DC, NULL}, - {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, 0, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL},

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVERTEXBUFFER7.
by Alexandre Julliard Nov. 8, 2012

Nov. 8, 2012

Module: wine Branch: master Commit: 98dc4cd43cb674fc09f560f18853316a0f26889c URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dc4cd43cb674fc09f560f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:13 2012 +0100 ddraw: Avoid LPDIRECT3DVERTEXBUFFER7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 147e48c..f1e20fc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -34,7 +34,7 @@ static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static LPDIRECT3DDEVICE7 lpD3DDevice = NULL; -static LPDIRECT3DVERTEXBUFFER7 lpVBufSrc = NULL; +static IDirect3DVertexBuffer7 *lpVBufSrc; static IDirectDraw *DirectDraw1 = NULL; static IDirectDrawSurface *Surface1 = NULL; diff --git a/include/d3d.h b/include/d3d.h index 64c17c7..d47df27 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -365,7 +365,8 @@ DECLARE_INTERFACE_(IDirect3D7,IUnknown) STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface7 *surface, struct IDirect3DDevice7 **device) PURE; - STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) PURE; + STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, + struct IDirect3DVertexBuffer7 **buffer, DWORD flags) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; }; @@ -1313,8 +1314,10 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, + DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, + DWORD start_vertex, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 **surface) PURE; STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 *surface) PURE; @@ -1499,7 +1502,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) /*** IDirect3DVertexBuffer7 methods ***/ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER7 lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, + IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, + IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;

1 0