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

appdb/include db.php
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26193 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/04 01:19:06 Modified files: include : db.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> query_parameters() usage example and the rule that all variables should be passed as parameters Patch: http://cvs.winehq.org/patch.py?id=26193 Old revision New revision Changes Path 1.17 1.18 +8 -0 appdb/include/db.php Index: appdb/include/db.php diff -u -p appdb/include/db.php:1.17 appdb/include/db.php:1.18 --- appdb/include/db.php:1.17 4 Jul 2006 6:19: 6 -0000 +++ appdb/include/db.php 4 Jul 2006 6:19: 6 -0000 @@ -36,6 +36,14 @@ function query_appdb($sQuery,$sComment=" * Values are mysql_real_escape_string()'d to prevent against injection attacks * See http://php.net/mysql_real_escape_string for more information about why this is the case * + * Usage: + * $hResult = query_parameters("Select * from mytable where userid = '?'", + * $iUserId); + * + * Note: + * Ensure that all variables are passed as parameters to query_parameters() + * to ensure that sql injection attacks are prevented against + * */ function query_parameters() {

1 0

appdb/include application.php bugs.php db.php ...
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26192 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/03 22:43:06 Modified files: include : application.php bugs.php db.php distributions.php testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Stop using compile_update_string(). compile_update_string() can be passed a value that includes a character considered special by query_parameters(). We then use the output from compile_update_string() as a part of the first parameter to query_parameters(), the format string. Having extra special characters causes a token mismatch and query_parameters() will reject the queries entirely. Remove now unused compile_update_string(). Patch: http://cvs.winehq.org/patch.py?id=26192 Old revision New revision Changes Path 1.54 1.55 +18 -28 appdb/include/application.php 1.11 1.12 +2 -3 appdb/include/bugs.php 1.16 1.17 +0 -29 appdb/include/db.php 1.8 1.9 +2 -4 appdb/include/distributions.php 1.27 1.28 +24 -13 appdb/include/testResults.php

1 0

appdb/include testResults.php
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26191 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/03 21:52:39 Modified files: include : testResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Pass a version object to hasAppVersionModifyPermission(), not a version id integer Patch: http://cvs.winehq.org/patch.py?id=26191 Old revision New revision Changes Path 1.26 1.27 +1 -1 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.26 appdb/include/testResults.php:1.27 --- appdb/include/testResults.php:1.26 4 Jul 2006 2:52:39 -0000 +++ appdb/include/testResults.php 4 Jul 2006 2:52:39 -0000 @@ -452,7 +452,7 @@ class testData{ echo ' <td>'.$oTest->sRuns.'&nbsp</td>',"\n"; echo ' <td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; echo ' <td>'.$sStatus.'&nbsp</td>',"\n"; - if ($_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)) + if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { echo '<td><a href="'.BASE.'admin/adminTestResults.php?sub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; echo 'Edit</a></td>',"\n";

1 0

appdb/include application.php
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26190 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/03 21:24:56 Modified files: include : application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add in missing & between url parameters Patch: http://cvs.winehq.org/patch.py?id=26190 Old revision New revision Changes Path 1.53 1.54 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.53 appdb/include/application.php:1.54 --- appdb/include/application.php:1.53 4 Jul 2006 2:24:56 -0000 +++ appdb/include/application.php 4 Jul 2006 2:24:56 -0000 @@ -333,7 +333,7 @@ class Application { $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; - $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=applicationappId=".$this->iAppId."\n"; + $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=application&appId=".$this->iAppId."\n"; $sMsg .= "Reason given:\n"; break; case "delete":

1 0

appdb/include comment.php
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26189 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/03 21:12:43 Modified files: include : comment.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Remove now unnecessary stripslashes() Patch: http://cvs.winehq.org/patch.py?id=26189 Old revision New revision Changes Path 1.22 1.23 +0 -3 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.22 appdb/include/comment.php:1.23 --- appdb/include/comment.php:1.22 4 Jul 2006 2:12:43 -0000 +++ appdb/include/comment.php 4 Jul 2006 2:12:43 -0000 @@ -220,9 +220,6 @@ function view_app_comment($oRow) echo html_frame_start('','98%'); echo '<table width="100%" border="0" cellpadding="2" cellspacing="1">',"\n"; - $oRow->subject = stripslashes($oRow->subject); - $oRow->body = stripslashes($oRow->body); - // message header echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$oRow->commentId."></a>\n"; echo " <b>".$oRow->subject."</b><br />\n";

1 0

appdb/include screenshot.php
by WineHQ 04 Jul '06

04 Jul '06

ChangeSet ID: 26188 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/03 21:11:09 Modified files: include : screenshot.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix screenshot display by using the image class member functions instead of class internal private variables Patch: http://cvs.winehq.org/patch.py?id=26188 Old revision New revision Changes Path 1.40 1.41 +4 -4 appdb/include/screenshot.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.40 appdb/include/screenshot.php:1.41 --- appdb/include/screenshot.php:1.40 4 Jul 2006 2:11: 9 -0000 +++ appdb/include/screenshot.php 4 Jul 2006 2:11: 9 -0000 @@ -410,14 +410,14 @@ function get_thumbnail($id) // set img tag $imgSRC = '<img src="'.apidb_fullurl("appimage.php"). '?thumbnail=true&id='.$id.'" alt="'.$oScreenshot->sDescription. - '" width="'.$oScreenshot->oThumbnailImage->width. - '" height="'.$oScreenshot->oThumbnailImage->height.'">'; + '" width="'.$oScreenshot->oThumbnailImage->get_width(). + '" height="'.$oScreenshot->oThumbnailImage->get_height().'">'; $img = '<a href="'.apidb_fullurl("appimage.php"). '?id='.$id. '" onclick="javascript:openWin(\''.apidb_fullurl("appimage.php"). '?id='.$id.'\',\''.$randName.'\','. - $oScreenshot->oScreenshotImage->width.','. - ($oScreenshot->oScreenshotImage->height+4). + ($oScreenshot->oScreenshotImage->get_width() + 20).','. + ($oScreenshot->oScreenshotImage->get_height() + 6). ');return false;">'.$imgSRC.'</a>'; // set image link based on user pref

1 0

Ivan Gyurdiev : wined3d: Add a function to print out D3DDECLUSAGE9 values.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 7e9fd0b4c1b633ab7bc16b1ea314c3aea350aed8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e9fd0b4c1b633ab7bc16b1… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 3 00:11:15 2006 -0600 wined3d: Add a function to print out D3DDECLUSAGE9 values. --- dlls/wined3d/utils.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a89a4c2..6a16729 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -249,6 +249,30 @@ #undef WINED3DUSAGE_TO_STR } } +const char* debug_d3ddeclusage(BYTE usage) { + switch (usage) { +#define WINED3DDECLUSAGE_TO_STR(u) case u: return #u + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_POSITION); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BLENDWEIGHT); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BLENDINDICES); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_NORMAL); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_PSIZE); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TEXCOORD); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TANGENT); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_BINORMAL); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_TESSFACTOR); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_POSITIONT); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_COLOR); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_FOG); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_DEPTH); + WINED3DDECLUSAGE_TO_STR(D3DDECLUSAGE_SAMPLE); +#undef WINED3DDECLUSAGE_TO_STR + default: + FIXME("Unrecognized %u declaration usage!\n", usage); + return "unrecognized"; + } +} + const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { switch (res) { #define RES_TO_STR(res) case res: return #res; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca09801..ab5eddf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1184,6 +1184,7 @@ const char* debug_d3dformat(WINED3DFORMA const char* debug_d3ddevicetype(D3DDEVTYPE devtype); const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res); const char* debug_d3dusage(DWORD usage); +const char* debug_d3ddeclusage(BYTE usage); const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType); const char* debug_d3drenderstate(DWORD state); const char* debug_d3dsamplerstate(DWORD state);

1 0

Ivan Gyurdiev : wined3d: Resync ARB mnxn function with GLSL mnxn function.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 1bfec25031f867b9ee4941ab503be01e3f9a7d23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1bfec25031f867b9ee4941a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 2 19:29:46 2006 -0600 wined3d: Resync ARB mnxn function with GLSL mnxn function. --- dlls/wined3d/arb_program_shader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 20a7e3a..753789f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -800,10 +800,14 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* int nComponents = 0; SHADER_OPCODE_ARG tmpArg; + memset(&tmpArg, 0, sizeof(SHADER_OPCODE_ARG)); + /* Set constants for the temporary argument */ - tmpArg.shader = arg->shader; - tmpArg.buffer = arg->buffer; - tmpArg.src[0] = arg->src[0]; + tmpArg.shader = arg->shader; + tmpArg.buffer = arg->buffer; + tmpArg.src[0] = arg->src[0]; + tmpArg.src_addr[0] = arg->src_addr[0]; + tmpArg.reg_maps = arg->reg_maps; switch(arg->opcode->opcode) { case D3DSIO_M4x4:

1 0

Ivan Gyurdiev : wined3d: Fix faulty DCL trace.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 0111e15e1f43c33a2ff2268424efbe83f0b57945 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0111e15e1f43c33a2ff2268… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 3 00:03:47 2006 -0600 wined3d: Fix faulty DCL trace. --- dlls/wined3d/baseshader.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 93eb367..a1b987f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -432,20 +432,22 @@ void shader_get_registers_used( } static void shader_dump_decl_usage( + IWineD3DBaseShaderImpl* This, DWORD decl, DWORD param) { DWORD regtype = shader_get_regtype(param); - TRACE("dcl_"); + + TRACE("dcl"); if (regtype == D3DSPR_SAMPLER) { DWORD ttype = decl & D3DSP_TEXTURETYPE_MASK; switch (ttype) { - case D3DSTT_2D: TRACE("2d"); break; - case D3DSTT_CUBE: TRACE("cube"); break; - case D3DSTT_VOLUME: TRACE("volume"); break; - default: TRACE("unknown_ttype(%08lx)", ttype); + case D3DSTT_2D: TRACE("_2d"); break; + case D3DSTT_CUBE: TRACE("_cube"); break; + case D3DSTT_VOLUME: TRACE("_volume"); break; + default: TRACE("_unknown_ttype(%08lx)", ttype); } } else { @@ -453,6 +455,13 @@ static void shader_dump_decl_usage( DWORD usage = decl & D3DSP_DCL_USAGE_MASK; DWORD idx = (decl & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + /* Pixel shaders 3.0 don't have usage semantics */ + char pshader = shader_is_pshader_version(This->baseShader.hex_version); + if (pshader && This->baseShader.hex_version < D3DPS_VERSION(3,0)) + return; + else + TRACE("_"); + switch(usage) { case D3DDECLUSAGE_POSITION: TRACE("%s%ld", "position", idx); @@ -884,7 +893,7 @@ void shader_trace_init( DWORD usage = *pToken; DWORD param = *(pToken + 1); - shader_dump_decl_usage(usage, param); + shader_dump_decl_usage(This, usage, param); shader_dump_ins_modifiers(param); TRACE(" "); shader_dump_param(iface, param, 0, 0);

1 0

Ivan Gyurdiev : wined3d: Use shader_get_regtype() in register counting pass .
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: fd896d8652483b5113d7d933a29035d9a3841cb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd896d8652483b5113d7d93… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 2 19:28:25 2006 -0600 wined3d: Use shader_get_regtype() in register counting pass. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e9e3097..93eb367 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -410,7 +410,7 @@ void shader_get_registers_used( DWORD param, addr_token, reg, regtype; pToken += shader_get_param(iface, pToken, &param, &addr_token); - regtype = (param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT; + regtype = shader_get_regtype(param); reg = param & D3DSP_REGNUM_MASK; if (D3DSPR_TEXTURE == regtype) { /* vs: D3DSPR_ADDR */

1 0