January 2007 - Wine-Commits

appdb/ admin/editAppVersion.php include/appDat ...
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30854 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/04 23:20:05 Modified files: admin : editAppVersion.php include : appData.php version.php tables : appdb_tables.sql Added files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add the ability to add download URLs to application versions. They are displayed in the version view marked as 'free downloads'. The links will later be used to allow browsing of downloadable applications. Patch: http://cvs.winehq.org/patch.py?id=30854 Old revision New revision Changes Path 1.42 1.43 +4 -0 appdb/admin/editAppVersion.php 1.1 1.2 +19 -0 appdb/include/appData.php 1.91 1.92 +4 -0 appdb/include/version.php Added 1.1 +0 -0 appdb/include/downloadurl.php 1.27 1.28 +1 -1 appdb/tables/appdb_tables.sql

1 0

appdb/include filter.php
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30853 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/04 22:59:04 Modified files: include : filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> When filtering copy Xinha variables verbatim instead of stripping out html tags Patch: http://cvs.winehq.org/patch.py?id=30853 Old revision New revision Changes Path 1.9 1.10 +11 -2 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.9 appdb/include/filter.php:1.10 --- appdb/include/filter.php:1.9 5 Jan 2007 4:59: 4 -0000 +++ appdb/include/filter.php 5 Jan 2007 4:59: 4 -0000 @@ -14,10 +14,19 @@ function filter_gpc() // Special cases for variables that don't fit our filtering scheme // don't filter the AppDB session cookie and MAX_FILE_SIZE // and the DialogX values that xinha uses - if($aKeys[$i] == "whq_appdb" || ($aKeys[$i] == "MAX_FILE_SIZE") || ($aKeys[$i] == "PHPSESSID") - || (strpos($aKeys[$i], "Dialog") == 0) || (strpos($aKeys[$i], "pref_") == 0)) + if(strpos($aKeys[$i], "Dialog") == 0) // Xinha variables { // copy the key over to the clean array + // NOTE: we do not strip html tags or trim any Xinha variables + // because Xinha is a html editor and removing html tags + // would break the ability to use Xinha to create or edit html + $aClean[$aKeys[$i]] = $_REQUEST[$aKeys[$i]]; + continue; // go to the next entry + } else if($aKeys[$i] == "whq_appdb" || ($aKeys[$i] == "MAX_FILE_SIZE") + || ($aKeys[$i] == "PHPSESSID") + || (strpos($aKeys[$i], "pref_") == 0)) // other variables + { + // copy the key over to the clean array after stripping tags and trimming $aClean[$aKeys[$i]] = trim(strip_tags($_REQUEST[$aKeys[$i]])); continue; // go to the next entry }

1 0

appdb/include incl.php
by WineHQ Jan. 4, 2007

Jan. 4, 2007

ChangeSet ID: 30852 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/04 22:44:39 Modified files: include : incl.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove a debug print accidentally committed with the filtering changes Patch: http://cvs.winehq.org/patch.py?id=30852 Old revision New revision Changes Path 1.39 1.40 +0 -1 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.39 appdb/include/incl.php:1.40 --- appdb/include/incl.php:1.39 5 Jan 2007 4:44:39 -0000 +++ appdb/include/incl.php 5 Jan 2007 4:44:39 -0000 @@ -290,7 +290,6 @@ $session->register("current"); if(!isset($_SESSION['current'])) { - echo "Session not set, creating new user"; $_SESSION['current'] = new User(); }

1 0

Chris Robinson : wined3d: state_pointsprite should apply to all texture units.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: d8c67c34155e83aa80fa482f3447afcb2da74d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c67c34155e83aa80fa482f3… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Jan 3 00:17:24 2007 -0800 wined3d: state_pointsprite should apply to all texture units. --- dlls/wined3d/state.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9d608c3..9e84877 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1053,6 +1053,9 @@ static void state_lastpixel(DWORD state, } static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock) { + unsigned int i; + int val; + /* TODO: NV_POINT_SPRITE */ if (!GL_SUPPORT(ARB_POINT_SPRITE)) { TRACE("Point sprites not supported\n"); @@ -1060,15 +1063,26 @@ static void state_pointsprite(DWORD stat } if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - glEnable(GL_POINT_SPRITE_ARB); - checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); - glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE); - checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, TRUE)"); + val = GL_TRUE; } else { - glDisable(GL_POINT_SPRITE_ARB); - checkGLcall("glDisable(GL_POINT_SPRITE_ARB)"); - glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE); - checkGLcall("glTexEnvf(GL_POINT_SPRITE, GL_COORD_REPLACE, FALSE)"); + val = GL_FALSE; + } + + for (i = 0; i < GL_LIMITS(texture_stages); i++) { + /* Note the WINED3DRS value applies to all textures, but GL has one + * per texture, so apply it now ready to be used! + */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i==1) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + break; + } + + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, val); + checkGLcall((val?"glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE)": + "glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE)")); } }

1 0

Eric Pouech : imagehlp: Make use of the bReadOnly parameter in MapAndLoad.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 2d6e914bc0dbd63490bfa6137af0b65713acaa9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6e914bc0dbd63490bfa6137… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jan 3 14:39:33 2007 +0100 imagehlp: Make use of the bReadOnly parameter in MapAndLoad. --- dlls/imagehlp/access.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 51ec161..1560d11 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -164,7 +164,9 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam goto Error; } - hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, + hFile = CreateFileA(szFileName, + GENERIC_READ | (bReadOnly ? 0 : GENERIC_WRITE), + FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -172,14 +174,16 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam goto Error; } - hFileMapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + hFileMapping = CreateFileMappingA(hFile, NULL, + (bReadOnly ? PAGE_READONLY : PAGE_READWRITE) | SEC_COMMIT, + 0, 0, NULL); if (!hFileMapping) { WARN("CreateFileMapping: Error = %d\n", GetLastError()); goto Error; } - mapping = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0); + mapping = MapViewOfFile(hFileMapping, bReadOnly ? FILE_MAP_READ : FILE_MAP_WRITE, 0, 0, 0); CloseHandle(hFileMapping); if (!mapping) {

1 0

Eric Pouech : imagehlp: Correctly handle files without NT headers in MapAndLoad.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 4950d3deb2f6c3fbc6609ccf5b82cbf3dc6be60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4950d3deb2f6c3fbc6609ccf5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jan 3 14:39:33 2007 +0100 imagehlp: Correctly handle files without NT headers in MapAndLoad. --- dlls/imagehlp/access.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index f7f352d..51ec161 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -187,7 +187,12 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam goto Error; } - pNtHeader = RtlImageNtHeader(mapping); + if (!(pNtHeader = RtlImageNtHeader(mapping))) + { + WARN("Not an NT header\n"); + UnmapViewOfFile(mapping); + goto Error; + } pLoadedImage->ModuleName = HeapAlloc(GetProcessHeap(), 0, strlen(szFileName) + 1);

1 0

Eric Pouech : imagehlp: Fixed computation of SizeOfImage in MapAndLoad.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 5dbb25170e73061abaf8cddfd6ec9bf8c5359c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbb25170e73061abaf8cddfd… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jan 3 14:39:33 2007 +0100 imagehlp: Fixed computation of SizeOfImage in MapAndLoad. --- dlls/imagehlp/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index cca765e..f7f352d 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -199,7 +199,7 @@ BOOL WINAPI MapAndLoad(LPSTR pszImageNam ((LPBYTE) &pNtHeader->OptionalHeader + pNtHeader->FileHeader.SizeOfOptionalHeader); pLoadedImage->NumberOfSections = pNtHeader->FileHeader.NumberOfSections; - pLoadedImage->SizeOfImage = pNtHeader->OptionalHeader.SizeOfImage; + pLoadedImage->SizeOfImage = GetFileSize(hFile, NULL); pLoadedImage->Characteristics = pNtHeader->FileHeader.Characteristics; pLoadedImage->LastRvaSection = pLoadedImage->Sections;

1 0

H. Verbeet : wined3d: Skip WINED3DTSS_TEXCOORDINDEX state application for stages that aren' t mapped to a texture unit.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: aced8de8532a6308a419c43a6c94027a702dd1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=aced8de8532a6308a419c43a6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 3 19:18:51 2007 +0100 wined3d: Skip WINED3DTSS_TEXCOORDINDEX state application for stages that aren't mapped to a texture unit. --- dlls/wined3d/state.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d0ef1e2..b76b53b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1499,13 +1499,18 @@ static void transform_texture(DWORD stat static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; + + if (mapped_stage == -1) { + TRACE("No texture unit mapped to stage %d. Skipping texture coordinates.\n", stage); + return; + } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - /* TODO: register combiners! */ if(stage >= GL_LIMITS(sampler_stages)) { return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); } else if (stage > 0) { /* We can't do anything here */

1 0

H. Verbeet : wined3d: Don' t do WINED3DTSS_ALPHAOP texture operations for stages that aren' t mapped to a texture unit.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: c7fad607ba98c5731e5b181ca060f8473b34e75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fad607ba98c5731e5b181ca… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 3 19:18:44 2007 +0100 wined3d: Don't do WINED3DTSS_ALPHAOP texture operations for stages that aren't mapped to a texture unit. --- dlls/wined3d/state.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e93787..d0ef1e2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1438,24 +1438,26 @@ static void tex_colorop(DWORD state, IWi static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; TRACE("Setting alpha op for stage %d\n", stage); /* Do not care for enabled / disabled stages, just assign the settigns. colorop disables / enables required stuff */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - /* TODO: register combiners! */ - if(stage >= GL_LIMITS(sampler_stages)) { - if(stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && - stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { - FIXME("Attempt to enable unsupported stage!\n"); + if (mapped_stage != -1) { + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + if (stage >= GL_LIMITS(sampler_stages)) { + if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && + stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { + FIXME("Attempt to enable unsupported stage!\n"); + } + return; } + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); + checkGLcall("glActiveTextureARB"); + } else if (stage > 0) { + /* We can't do anything here */ + WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[stage])); - checkGLcall("glActiveTextureARB"); - } else if (stage > 0) { - /* We can't do anything here */ - WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - return; } TRACE("Setting alpha op for stage %d\n", stage); @@ -1465,7 +1467,7 @@ static void tex_alphaop(DWORD state, IWi stateblock->textureState[stage][WINED3DTSS_ALPHAARG1], stateblock->textureState[stage][WINED3DTSS_ALPHAARG2], stateblock->textureState[stage][WINED3DTSS_ALPHAARG0], - stateblock->wineD3DDevice->texUnitMap[stage]); + mapped_stage); } else { set_tex_op((IWineD3DDevice *)stateblock->wineD3DDevice, TRUE, stage, stateblock->textureState[stage][WINED3DTSS_ALPHAOP], stateblock->textureState[stage][WINED3DTSS_ALPHAARG1],

1 0

H. Verbeet : wined3d: Skip sampler state application for stages that aren' t mapped to a texture unit.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 7ae71a92a2d12c241d22e4b620c7edfe6b6db5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae71a92a2d12c241d22e4b62… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 3 19:18:59 2007 +0100 wined3d: Skip sampler state application for stages that aren't mapped to a texture unit. --- dlls/wined3d/state.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b76b53b..9d608c3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1702,6 +1702,7 @@ static void tex_resultarg(DWORD state, I static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock) { DWORD sampler = state - STATE_SAMPLER(0); + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[sampler]; union { float f; DWORD d; @@ -1711,12 +1712,17 @@ static void sampler(DWORD state, IWineD3 /* Enabling and disabling texture dimensions is done by texture stage state / pixel shader setup, this function * only has to bind textures and set the per texture states */ + + if (mapped_stage == -1) { + TRACE("No sampler mapped to stage %d. Returning.\n", sampler); + return; + } + if (GL_SUPPORT(ARB_MULTITEXTURE)) { - /* TODO: register combiners! */ if(sampler >= GL_LIMITS(sampler_stages)) { return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[sampler])); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); } else if (sampler > 0) { /* We can't do anything here */

1 0