January 2010 - Wine-commits

Dan Kegel : cmd: Echoed prompts are preceded by a blank line.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 27235ecb65408a23ca61dd64202abcd9b8df8c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27235ecb65408a23ca61dd642… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:00:45 2010 -0800 cmd: Echoed prompts are preceded by a blank line. --- programs/cmd/wcmdmain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f3a0ca..d5ef48c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -325,6 +325,8 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; + *q++ = '\r'; + *q++ = '\n'; *q = '\0'; while (*p != '\0') { if (*p != '$') {

1 0

Dan Kegel : cmd: Fix echoing of multiline commands.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b6e8e135996cbd0b4ed3f5d6292e9a8f70c69ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e8e135996cbd0b4ed3f5d62… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:04:05 2010 -0800 cmd: Fix echoing of multiline commands. --- programs/cmd/wcmdmain.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d5ef48c..e94cb3b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1269,13 +1269,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, handleExpansion(new_redir, (context != NULL), forVariable, forValue); cmd = new_cmd; - /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && (cmd[0] != '@')) { - WCMD_show_prompt(); - WCMD_output_asis ( cmd); - WCMD_output_asis ( newline); - } - /* * Changing default drive has to be handled as a special case. */ @@ -1774,6 +1767,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Show prompt before batch line IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_show_prompt(); + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } /* Start with an empty string, copying to the command string */ curStringLen = 0; @@ -2106,6 +2105,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Continue to echo commands IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } } }

1 0

Henri Verbeet : wined3d: Move "wrap_lookup" to struct wined3d_gl_info.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: f50b4c7d71c8074d0b29b2e9176329bf004942c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b4c7d71c8074d0b29b2e91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:22 2010 +0100 wined3d: Move "wrap_lookup" to struct wined3d_gl_info. --- dlls/wined3d/basetexture.c | 17 ++++++++--------- dlls/wined3d/directx.c | 12 +++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index e671ec4..f3c3fe7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -323,7 +323,8 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac } /* GL locking is done by the caller */ -static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) +static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, + WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) { GLint gl_wrap; @@ -341,7 +342,7 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par } else { - gl_wrap = wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; + gl_wrap = gl_info->wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; } TRACE("Setting param %#x to %#x for target %#x.\n", param, gl_wrap, target); @@ -352,7 +353,8 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par /* GL locking is done by the caller (state handler) */ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; DWORD state; @@ -373,19 +375,19 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if(samplerStates[WINED3DSAMP_ADDRESSU] != gl_tex->states[WINED3DTEXSTA_ADDRESSU]) { state = samplerStates[WINED3DSAMP_ADDRESSU]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSU] = state; } if(samplerStates[WINED3DSAMP_ADDRESSV] != gl_tex->states[WINED3DTEXSTA_ADDRESSV]) { state = samplerStates[WINED3DSAMP_ADDRESSV]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSV] = state; } if(samplerStates[WINED3DSAMP_ADDRESSW] != gl_tex->states[WINED3DTEXSTA_ADDRESSW]) { state = samplerStates[WINED3DSAMP_ADDRESSW]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSW] = state; } @@ -475,9 +477,6 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if (gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] != aniso) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) { glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 487b435..e0e6880 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,8 +156,6 @@ static const struct { static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat, WINED3DSURFTYPE SurfaceType); -GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; - const struct min_lookup minMipLookup[] = { /* NONE POINT LINEAR */ @@ -2123,13 +2121,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str else gl_info->vidmem = WINE_DEFAULT_VIDMEM; - wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; + gl_info->wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; - wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; + gl_info->wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; /* Make sure there's an active HDC else the WGL extensions will fail */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8078118..e984529 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3520,7 +3520,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], - stateblock->textureState[sampler], stateblock->samplerState[sampler]); + stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); if (context->gl_info->supported[EXT_TEXTURE_LOD_BIAS]) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4eb57d2..49f8114 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4101,6 +4101,7 @@ struct wined3d_gl_info DWORD reserved_glsl_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; + GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; struct wined3d_fbo_ops fbo_ops; /* GL function pointers */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 361967b..3cb0942 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -149,8 +149,6 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -extern GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1] DECLSPEC_HIDDEN; - struct min_lookup { GLenum mip[WINED3DTEXF_LINEAR + 1]; @@ -1758,8 +1756,9 @@ typedef struct IWineD3DBaseTextureImpl } IWineD3DBaseTextureImpl; void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, - const DWORD texture_states[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1]) DECLSPEC_HIDDEN; + const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;

1 0

Andrew Nguyen : wine.inf: Add CommonProgramFiles system environment variable.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: c4ffbade8671d519b7dcf8f8737b670826b61a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ffbade8671d519b7dcf8f87… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 31 07:58:50 2009 -0600 wine.inf: Add CommonProgramFiles system environment variable. --- dlls/userenv/tests/userenv.c | 2 +- tools/wine.inf.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 9003354..39c1bbf 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -95,7 +95,7 @@ static void test_create_env(void) { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, { "TEMP", { 1, 1, 0, 0 } }, { "TMP", { 1, 1, 0, 0 } }, - { "CommonProgramFiles", { 1, 1, 1, 1 } }, + { "CommonProgramFiles", { 1, 1, 0, 0 } }, { "ProgramFiles", { 1, 1, 0, 0 } } }; static const struct profile_item htok_vars[] = { diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cb33038..e03a7e4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -453,6 +453,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"CommonProgramFiles",,"%16427%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH"

1 0

Alexander Nicolaysen Sørnes : bug: Allow admins to only show queued links for versions they maintain
by Alexander Nicolaysen Sørnes 01 Jan '10

01 Jan '10

Module: appdb Branch: master Commit: a45cbc01130b5dae9390cea2183a24c3b5bf37cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a45cbc01130b5dae9390cea2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jan 1 15:24:41 2010 +0100 bug: Allow admins to only show queued links for versions they maintain --- include/bugs.php | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 104 insertions(+), 8 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 9f59fa9..b07a3ca 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -406,6 +406,7 @@ class Bug return null; $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show bug links for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show bug links for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); return $oFilter; } @@ -413,8 +414,24 @@ class Bug function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = '', $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oBug = new bug(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oBug->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { @@ -423,24 +440,70 @@ class Bug $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; } - $sLimit = ""; - /* Selecting 0 rows makes no sense, so we assume the user wants to select all of them after an offset given by iStart */ if(!$iRows) $iRows = bug::objectGetEntriesCount($sState, $oFilters); - $sQuery = "select * from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter LIMIT ?, ?"; - $hResult = query_parameters($sQuery, $sState, $iStart, $iRows); + if($bOnlyMyMaintainedEntries) + { + $sQuery = "SELECT buglinks.* FROM buglinks, appVersion, + appMaintainers WHERE + buglinks.versionId = appVersion.versionId + AND + appMaintainers.userId = '?' + AND + ( + ( + appMaintainers.superMaintainer = '1' + AND + appMaintainers.appId = appVersion.appid + ) + OR + ( + appMaintainers.superMaintainer = '0' + AND + appMaintainers.versionId = appVersion.versionId + ) + ) + AND + appMaintainers.state = 'accepted' + AND + buglinks.state = '?'$sWhereFilter LIMIT ?,?"; + + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sState, $iStart, $iRows); + } else + { + $sQuery = "select * from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter LIMIT ?, ?"; + $hResult = query_parameters($sQuery, $sState, $iStart, $iRows); + } + return $hResult; } function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oBug = new bug(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oBug->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { @@ -449,9 +512,42 @@ class Bug $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = buglinks.versionId"; } - $sQuery = "select count(*) as cnt from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter"; - $hResult = query_parameters($sQuery, $sState); + if($bOnlyMyMaintainedEntries) + { + $sQuery = "SELECT COUNT(buglinks.linkId) as cnt FROM buglinks, appVersion, + appMaintainers WHERE + buglinks.versionId = appVersion.versionId + AND + appMaintainers.userId = '?' + AND + ( + ( + appMaintainers.superMaintainer = '1' + AND + appMaintainers.appId = appVersion.appid + ) + OR + ( + appMaintainers.superMaintainer = '0' + AND + appMaintainers.versionId = appVersion.versionId + ) + ) + AND + appMaintainers.state = 'accepted' + AND + buglinks.state = '?'$sWhereFilter"; + + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, + $sState); + } else + { + $sQuery = "select count(*) as cnt from buglinks$sExtraTables where buglinks.state = '?'$sWhereFilter"; + $hResult = query_parameters($sQuery, $sState); + } + $oRow = mysql_fetch_object($hResult); + return $oRow->cnt; }

1 0