July 2006 - Wine-commits - list.winehq.org

appdb/. addcomment.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26321 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:22:04 Modified files: . : addcomment.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in addcomment.php Patch: http://cvs.winehq.org/patch.py?id=26321 Old revision New revision Changes Path 1.31 1.32 +1 -15 appdb/addcomment.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.31 appdb/addcomment.php:1.32 --- appdb/addcomment.php:1.31 7 Jul 2006 16:22: 4 -0000 +++ appdb/addcomment.php 7 Jul 2006 16:22: 4 -0000 @@ -14,16 +14,10 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/application.php"); require(BASE."include/mail.php"); -$aClean = array(); //array of filtered user input - -$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); -$aClean['iThread'] = makeSafe($_REQUEST['iThread']); -$aClean['sBody'] = makeSafe($_REQUEST['sBody']); -$aClean['sSubject'] = makeSafe($_REQUEST['sSubject']); - // you must be logged in to submit comments if(!$_SESSION['current']->isLoggedIn()) { @@ -32,14 +26,6 @@ if(!$_SESSION['current']->isLoggedIn()) exit; } -if( !is_numeric($aClean['iVersionId']) ) - util_show_error_page_and_exit('Internal Database Access Error'); - -if(!is_numeric($aClean['iThread'])) -{ - $aClean['iThread'] = 0; -} - // the user submitted his comment if(!empty($aClean['sBody'])) {

1 0

appdb/. account.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26320 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:18:07 Modified files: . : account.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in account.php Patch: http://cvs.winehq.org/patch.py?id=26320 Old revision New revision Changes Path 1.32 1.33 +6 -23 appdb/account.php Index: appdb/account.php diff -u -p appdb/account.php:1.32 appdb/account.php:1.33 --- appdb/account.php:1.32 7 Jul 2006 16:18: 7 -0000 +++ appdb/account.php 7 Jul 2006 16:18: 7 -0000 @@ -20,20 +20,14 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/mail.php"); // set http header to not cache header("Pragma: no-cache"); header("Cache-control: no-cache"); -$aClean = array(); //array of filtered user input - -// check command and process -if(!empty($_POST['sCmd'])) - $aClean['sCmd'] = makeSafe( $_POST['sCmd'] ); -else - $aClean['sCmd'] = makeSafe( $_GET['sCmd'] ); - +// process command do_account($aClean['sCmd']); @@ -95,13 +89,7 @@ function retry($sCmd, $sMsg) */ function cmd_do_new() { - $aClean = array(); //array of filtered user input - - $aClean['sUserEmail'] = makeSafe($_POST['sUserEmail']); - $aClean['sUserPassword'] = makeSafe($_POST['sUserPassword']); - $aClean['sUserPassword2'] = makeSafe($_POST['sUserPassword2']); - $aClean['sWineRelease'] = makeSafe($_POST['sWineRelease']); - $aClean['sUserRealname']= makeSafe($_POST['sUserRealname']); + global $aClean; if(!ereg("^.+(a).+\\..+$", $aClean['sUserEmail'])) { @@ -159,10 +147,8 @@ function cmd_do_new() */ function cmd_send_passwd() { - $aClean = array(); //array of filtered user input - - $aClean['sUserEmail'] = makeSafe($_POST['sUserEmail']); - + global $aClean; + /* if the user didn't enter any email address we should */ /* ask them to */ if($aClean['sUserEmail'] == "") @@ -217,10 +203,7 @@ function cmd_send_passwd() */ function cmd_do_login() { - $aClean = array(); //array of filtered user input - - $aClean['sUserEmail'] = makeSafe($_POST['sUserEmail']); - $aClean['sUserPassword'] = makeSafe($_POST['sUserPassword']); + global $aClean; $oUser = new User(); $iResult = $oUser->login($aClean['sUserEmail'], $aClean['sUserPassword']);

1 0

appdb/include form_login.php
by WineHQ 07 Jul '06

07 Jul '06

ChangeSet ID: 26319 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/07 11:16:19 Modified files: include : form_login.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename login to sLogin for upcoming filter changes to account.php Patch: http://cvs.winehq.org/patch.py?id=26319 Old revision New revision Changes Path 1.7 1.8 +1 -1 appdb/include/form_login.php Index: appdb/include/form_login.php diff -u -p appdb/include/form_login.php:1.7 appdb/include/form_login.php:1.8 --- appdb/include/form_login.php:1.7 7 Jul 2006 16:16:19 -0000 +++ appdb/include/form_login.php 7 Jul 2006 16:16:19 -0000 @@ -33,7 +33,7 @@ function cmd_send_passwd() { </tr> <tr> <td colspan=2 align=center class=color3> - <input type="submit" name="login" value=" Login " class=button> + <input type="submit" name="sLogin" value=" Login " class=button> </td> </tr> </table>

1 0

Stefan Dösinger : Add a common fps counter channel to ddraw, opengl and d3d.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: eb527c82e232d4fe93d498715de9a8bce0e1f36e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb527c82e232d4fe93d4987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 5 18:35:21 2006 +0200 Add a common fps counter channel to ddraw, opengl and d3d. --- dlls/wined3d/surface_gdi.c | 16 ++++++++++++++++ dlls/wined3d/swapchain.c | 6 +++--- dlls/winex11.drv/opengl.c | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index ddea727..bb07afa 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -34,6 +34,7 @@ #include <stdio.h> /* Use the d3d_surface debug channel to have one channel for all surfaces */ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DECLARE_DEBUG_CHANNEL(fps); /***************************************************************************** * x11_copy_to_screen @@ -379,6 +380,21 @@ #endif /* Update the screen */ x11_copy_to_screen(This, NULL); + /* FPS support */ + if (TRACE_ON(fps)) + { + static long prev_time, frames; + + DWORD time = GetTickCount(); + frames++; + /* every 1.5 seconds */ + if (time - prev_time > 1500) { + TRACE_(fps)("@ approx %.2ffps\n", 1000.0*frames/(time - prev_time)); + prev_time = time; + frames = 0; + } + } + return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e7fd2b3..3585ee3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -51,7 +51,7 @@ inline static Display *get_display( HDC WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_fps); +WINE_DECLARE_DEBUG_CHANNEL(fps); /* IDirect3DSwapChain IUnknown parts follow: */ @@ -265,7 +265,7 @@ #endif TRACE("glXSwapBuffers called, Starting new frame\n"); /* FPS support */ - if (TRACE_ON(d3d_fps)) + if (TRACE_ON(fps)) { static long prev_time, frames; @@ -273,7 +273,7 @@ #endif frames++; /* every 1.5 seconds */ if (time - prev_time > 1500) { - TRACE_(d3d_fps)("@ approx %.2ffps\n", 1000.0*frames/(time - prev_time)); + TRACE_(fps)("@ approx %.2ffps\n", 1000.0*frames/(time - prev_time)); prev_time = time; frames = 0; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2fe6c9d..486f7db 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -30,6 +30,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); +WINE_DECLARE_DEBUG_CHANNEL(fps); #if defined(HAVE_GL_GL_H) && defined(HAVE_GL_GLX_H) @@ -593,6 +594,21 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE * pglXSwapBuffers(gdi_display, drawable); wine_tsx11_unlock(); + /* FPS support */ + if (TRACE_ON(fps)) + { + static long prev_time, frames; + + DWORD time = GetTickCount(); + frames++; + /* every 1.5 seconds */ + if (time - prev_time > 1500) { + TRACE_(fps)("@ approx %.2ffps\n", 1000.0*frames/(time - prev_time)); + prev_time = time; + frames = 0; + } + } + return TRUE; }

1 0

Jacek Caban : mshtml: Create nsWineURI even if we don't have valid nsIURI.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: bb64efaf7778a937900899508a3584defb898053 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb64efaf7778a9379008995… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 15:17:27 2006 +0200 mshtml: Create nsWineURI even if we don't have valid nsIURI. --- dlls/mshtml/nsio.c | 246 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 202 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bb64efaf7778a937900…

1 0

Jacek Caban : shdocvw: Added test of SetClientSite.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 37b57a51da20242caaa594222fdbeef64fbeb463 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37b57a51da20242caaa5942… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 15:16:07 2006 +0200 shdocvw: Added test of SetClientSite. --- dlls/shdocvw/tests/Makefile.in | 2 dlls/shdocvw/tests/webbrowser.c | 383 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 384 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=37b57a51da20242caaa…

1 0

Jacek Caban : shdocvw: Call GetContainer in SetClientSite.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: b6d081804339ac85f61ad60ddfb8a178705a6bca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6d081804339ac85f61ad60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 15:15:24 2006 +0200 shdocvw: Call GetContainer in SetClientSite. --- dlls/shdocvw/oleobject.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index a6df8a6..513b128 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -26,6 +26,7 @@ #include <string.h> #include "wine/debug.h" #include "shdocvw.h" +#include "htiframe.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -206,6 +207,7 @@ static ULONG WINAPI OleObject_Release(IO static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE pClientSite) { WebBrowser *This = OLEOBJ_THIS(iface); + IOleContainer *container; HRESULT hres; TRACE("(%p)->(%p)\n", This, pClientSite); @@ -247,6 +249,20 @@ static HRESULT WINAPI OleObject_SetClien if(FAILED(hres)) This->doc_host.hostui = NULL; + hres = IOleClientSite_GetContainer(This->client, &container); + if(SUCCEEDED(hres)) { + ITargetContainer *target_container; + + hres = IOleContainer_QueryInterface(container, &IID_ITargetContainer, + (void**)&target_container); + if(SUCCEEDED(hres)) { + FIXME("Unsupported ITargetContainer\n"); + ITargetContainer_Release(target_container); + } + + IOleContainer_Release(container); + } + create_shell_embedding_hwnd(This); return S_OK;

1 0

Jacek Caban : include: Added htiframe.idl.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: ccee0297d5a06a6e17b52f504d45b58740779f96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccee0297d5a06a6e17b52f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 15:12:56 2006 +0200 include: Added htiframe.idl. --- dlls/uuid/uuid.c | 1 include/.gitignore | 1 include/Makefile.in | 1 include/htiframe.idl | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+), 0 deletions(-) create mode 100644 include/htiframe.idl diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 41795b6..98cdffb 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -65,6 +65,7 @@ #include "objsel.h" #include "hlink.h" #include "optary.h" #include "indexsvr.h" +#include "htiframe.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index 7996266..0a38030 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -12,6 +12,7 @@ docobj.h downloadmgr.h exdisp.h hlink.h +htiframe.h iads.h indexsvr.h mediaobj.h diff --git a/include/Makefile.in b/include/Makefile.in index 0b7039b..14c9b2f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -17,6 +17,7 @@ WINDOWS_IDL_SRCS = \ downloadmgr.idl \ exdisp.idl \ hlink.idl \ + htiframe.idl \ iads.idl \ indexsvr.idl \ mediaobj.idl \ diff --git a/include/htiframe.idl b/include/htiframe.idl new file mode 100644 index 0000000..21a55a4 --- /dev/null +++ b/include/htiframe.idl @@ -0,0 +1,134 @@ +/* + * Copyright 2006 Jacek Caban 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 + */ + +import "objidl.idl"; +import "oleidl.idl"; + +/***************************************************************************** + * ITargetNotify interface + */ +[ + object, + uuid(863a99a0-21bc-11d0-82b4-00a0c90c29c5), + pointer_default(unique) +] +interface ITargetNotify : IUnknown +{ + typedef [unique] ITargetNotify *LPTARGETNOTIFY; + + HRESULT OnCreate( + [in] IUnknown *pUnkDestination, + [in] ULONG cbCookie); + + HRESULT OnReuse([in] IUnknown *pUnkDestination); +} + +/***************************************************************************** + * ITargetNotify2 interface + */ +[ + object, + uuid(3050f6b1-98b5-11cf-bb82-00aa00bdce0b), + pointer_default(unique) +] +interface ITargetNotify2 : ITargetNotify +{ + typedef [unique] ITargetNotify2 *LPTARGETNOTIFY2; + + HRESULT GetOptionString([in,out] BSTR *pbstrOptions); +} + +/***************************************************************************** + * ITargetFrame2 interface + */ +[ + object, + uuid(86d52e11-94a8-11d0-82af-00c04fd5ae38), + pointer_default(unique) +] +interface ITargetFrame2 : IUnknown +{ + typedef [unique] ITargetFrame2 *LPTARGETFRAME2; + + typedef enum { + FINDFRAME_NONE = 0, + FINDFRAME_JUSTTESTEXISTENCE = 1, + FINDFRAME_INTERNAL = 0x80000000 + } FINDFRAME_FLAGS; + + typedef enum { + FRAMEOPTIONS_SCROLL_YES = 0x00000001, + FRAMEOPTIONS_SCROLL_NO = 0x00000002, + FRAMEOPTIONS_SCROLL_AUTO = 0x00000004, + FRAMEOPTIONS_NORESIZE = 0x00000008, + FRAMEOPTIONS_NO3DBORDER = 0x00000010, + FRAMEOPTIONS_DESKTOP = 0x00000020, + FRAMEOPTIONS_BROWSERBAND = 0x00000040 + } FRAMEOPTIONS_FLAGS; + + HRESULT SetFrameName([in] LPCWSTR pszFrameName); + + HRESULT GetFrameName([out] LPWSTR *ppszFrameName); + + HRESULT GetParentFrame([out] IUnknown **ppunkParent); + + HRESULT SetFrameSrc([in] LPCWSTR pszFrameSrc); + + HRESULT GetFrameSrc([out] LPWSTR *ppszFrameSrc); + + HRESULT GetFramesContainer([out] IOleContainer **ppContainer); + + HRESULT SetFrameOptions([in] DWORD dwFlags); + + HRESULT GetFrameOptions([out] DWORD *pdwFlags); + + HRESULT SetFrameMargins( + [in] DWORD dwWidth, + [in] DWORD dwHeight); + + HRESULT GetFrameMargins( + [out] DWORD *pdwWidth, + [out] DWORD *pdwHeight); + + HRESULT FindFrame( + [in,unique] LPCWSTR pszTargetName, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT GetTargetAlias( + [in,unique] LPCWSTR pszTargetName, + [out] LPWSTR *ppszTargetAlias); +} + +/***************************************************************************** + * ITargetContainer interface + */ +[ + object, + uuid(7847ec01-2bec-11d0-82b4-00a0c90C29c5), + pointer_default(unique) +] +interface ITargetContainer : IUnknown +{ + typedef [unique] ITargetContainer *LPTARGETCONTAINER; + + HRESULT GetFrameUrl([out] LPWSTR *ppszFrameSrc); + + HRESULT GetFramesContainer([out] IOleContainer **ppContainer); + +}

1 0

Ivan Gyurdiev : wined3d: Trace ABS/ABSNEG modifiers.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 5638fac685ec40fa0c6c5db1e5bd919650fdfdee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5638fac685ec40fa0c6c5db… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:29:39 2006 -0600 wined3d: Trace ABS/ABSNEG modifiers. --- dlls/wined3d/baseshader.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b7aa45f..84c86c7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -436,6 +436,7 @@ void shader_dump_param( DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); + DWORD modifier = param & D3DSP_SRCMOD_MASK; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); @@ -449,15 +450,19 @@ void shader_dump_param( swizzle_reg_chars[3] = pshader? 'a': 'w'; if (input) { - if ( ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) || - ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_BIASNEG) || - ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_SIGNNEG) || - ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_X2NEG) ) + if ( (modifier == D3DSPSM_NEG) || + (modifier == D3DSPSM_BIASNEG) || + (modifier == D3DSPSM_SIGNNEG) || + (modifier == D3DSPSM_X2NEG) || + (modifier == D3DSPSM_ABSNEG) ) TRACE("-"); - else if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_COMP) + else if (modifier == D3DSPSM_COMP) TRACE("1-"); - else if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NOT) + else if (modifier == D3DSPSM_NOT) TRACE("!"); + + if (modifier == D3DSPSM_ABS || modifier == D3DSPSM_ABSNEG) + TRACE("abs("); } switch (regtype) { @@ -546,9 +551,8 @@ void shader_dump_param( DWORD swizzle_b = (swizzle >> 4) & 0x03; DWORD swizzle_a = (swizzle >> 6) & 0x03; - if (0 != (param & D3DSP_SRCMOD_MASK)) { - DWORD mask = param & D3DSP_SRCMOD_MASK; - switch (mask) { + if (0 != modifier) { + switch (modifier) { case D3DSPSM_NONE: break; case D3DSPSM_NEG: break; case D3DSPSM_NOT: break; @@ -561,8 +565,10 @@ void shader_dump_param( case D3DSPSM_X2NEG: TRACE("_x2"); break; case D3DSPSM_DZ: TRACE("_dz"); break; case D3DSPSM_DW: TRACE("_dw"); break; + case D3DSPSM_ABSNEG: TRACE(")"); break; + case D3DSPSM_ABS: TRACE(")"); break; default: - TRACE("_unknown_modifier(%#lx)", mask >> D3DSP_SRCMOD_SHIFT); + TRACE("_unknown_modifier(%#lx)", modifier >> D3DSP_SRCMOD_SHIFT); } }

1 0

Ivan Gyurdiev : wined3d: Create fake input semantics for d3d8 shaders.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 899c8cdb64b6950c37ba875e3c9611337c127452 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=899c8cdb64b6950c37ba875… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:28:30 2006 -0600 wined3d: Create fake input semantics for d3d8 shaders. Use them to remove the need for loading arrays in two different places. --- dlls/wined3d/drawprim.c | 13 ------------- dlls/wined3d/vertexshader.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 25e2c1e..1a1d01e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -451,19 +451,6 @@ void primitiveDeclarationConvertToStride TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); - if (useVertexShaderFunction && reg != -1 && (data || streamVBO) ) { - WINED3DGLTYPE glType = glTypeLookup[element->Type]; - - TRACE("(%p) : Set vertex attrib pointer: reg 0x%08x, d3d type 0x%08x, stride 0x%08lx, data %p)\n", This, reg, element->Type, stride, data); - - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, streamVBO)); - checkGLcall("glBindBufferARB"); - GL_EXTCALL(glVertexAttribPointerARB(reg, glType.size, glType.glType, glType.normalized, stride, data)); - checkGLcall("glVertexAttribPointerARB"); - GL_EXTCALL(glEnableVertexAttribArrayARB(reg)); - checkGLcall("glEnableVertexAttribArrayARB"); - } - if (useVertexShaderFunction) stride_used = vshader_get_input(This->stateBlock->vertexShader, element->Usage, element->UsageIndex, &idx); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 7d452d2..db07675 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -609,6 +609,28 @@ static void vshader_set_limits( } } +/* This is an internal function, + * used to create fake semantics for shaders + * that don't have them - d3d8 shaders where the declaration + * stores the register for each input + */ +static void vshader_set_input( + IWineD3DVertexShaderImpl* This, + unsigned int regnum, + BYTE usage, BYTE usage_idx) { + + /* Fake usage: set reserved bit, usage, usage_idx */ + DWORD usage_token = (0x1 << 31) | + (usage << D3DSP_DCL_USAGE_SHIFT) | (usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT); + + /* Fake register; set reserved bit, regnum, type: input, wmask: all */ + DWORD reg_token = (0x1 << 31) | + D3DSP_WRITEMASK_ALL | (D3DSPR_INPUT << D3DSP_REGTYPE_SHIFT) | regnum; + + This->semantics_in[regnum].usage = usage_token; + This->semantics_in[regnum].reg = reg_token; +} + BOOL vshader_get_input( IWineD3DVertexShader* iface, BYTE usage_req, BYTE usage_idx_req, @@ -637,7 +659,13 @@ BOOL vshader_input_is_color( IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) iface; DWORD usage_token = This->semantics_in[regnum].usage; DWORD usage = (usage_token & D3DSP_DCL_USAGE_MASK) >> D3DSP_DCL_USAGE_SHIFT; - return usage == D3DDECLUSAGE_COLOR; + + /* FIXME: D3D8 shader: the semantics token is not the way to + * determine color info, since it is just a fake map to shader inputs */ + if (This->vertexDeclaration != NULL) + return FALSE; + else + return usage == D3DDECLUSAGE_COLOR; } /** Generate a vertex shader string using either GL_VERTEX_PROGRAM_ARB @@ -1077,6 +1105,16 @@ static HRESULT WINAPI IWineD3DVertexShad shader_trace_init((IWineD3DBaseShader*) This, pFunction); vshader_set_limits(This); + /* Preload semantics for d3d8 shaders */ + if (This->vertexDeclaration) { + IWineD3DVertexDeclarationImpl* vdecl = (IWineD3DVertexDeclarationImpl*) This->vertexDeclaration; + int i; + for (i = 0; i < vdecl->declarationWNumElements - 1; ++i) { + WINED3DVERTEXELEMENT* element = vdecl->pDeclarationWine + i; + vshader_set_input(This, element->Reg, element->Usage, element->UsageIndex); + } + } + /* Second pass: figure out registers used, semantics, etc.. */ memset(&reg_maps, 0, sizeof(shader_reg_maps)); shader_get_registers_used((IWineD3DBaseShader*) This, &reg_maps,

1 0