March 2007 - Wine-Commits - list.winehq.org

Joris Huizer : amstream: sign-compare fixes.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: a19b5680638d15c35256b54e000e020923319a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19b5680638d15c35256b54e0… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 17 07:13:10 2007 -0700 amstream: sign-compare fixes. --- dlls/amstream/amstream.c | 2 +- dlls/amstream/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 449a2d2..f251475 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -123,7 +123,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetMediaStream(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; MSPID PurposeId; - int i; + unsigned int i; TRACE("(%p/%p)->(%p,%p)\n", This, iface, idPurpose, ppMediaStream); diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index ac1dd0c..774a8ee 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -167,7 +167,7 @@ static const IClassFactoryVtbl DSCF_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i; + unsigned int i; IClassFactoryImpl *factory; TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Erich Hoover : wined3d: Fix LockRect memory location calculation for WINED3DFMT_DXT*.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 01199072dd91dfb0d3003a5d7c9c53bf852db164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01199072dd91dfb0d3003a5d7… Author: Erich Hoover <ehoover(a)mediaserver> Date: Mon Mar 12 17:07:12 2007 -0600 wined3d: Fix LockRect memory location calculation for WINED3DFMT_DXT*. --- dlls/d3d9/tests/surface.c | 2 +- dlls/wined3d/surface.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 7063a2a..189ebf6 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -218,7 +218,7 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) offset = (BYTE *)locked_rect.pBits - base; expected_offset = (rect.top / dxt_formats[i].block_height) * locked_rect.Pitch + (rect.left / dxt_formats[i].block_width) * dxt_formats[i].block_size; - todo_wine ok(offset == expected_offset, "Got offset %u, expected offset %u for format %s\n", offset, expected_offset, dxt_formats[i].name); + ok(offset == expected_offset, "Got offset %u, expected offset %u for format %s\n", offset, expected_offset, dxt_formats[i].name); hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a295bc7..1f4ddb6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -623,8 +623,18 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED return WINED3DERR_INVALIDCALL; } - if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */ - pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + ((pRect->left * This->bytesPerPixel / 2)); + /* DXTn textures are based on compressed blocks of 4x4 pixels, each + * 16 bytes large (8 bytes in case of DXT1). Because of that Pitch has + * slightly different meaning compared to regular textures. For DXTn + * textures Pitch is the size of a row of blocks, 4 high and "width" + * long. The x offset is calculated differently as well, since moving 4 + * pixels to the right actually moves an entire 4x4 block to right, ie + * 16 bytes (8 in case of DXT1). */ + if (This->resource.format == WINED3DFMT_DXT1) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 2); + } else if (This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 + || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { + pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top / 4) + (pRect->left * 4); } else { pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + (pRect->left * This->bytesPerPixel); }

1 0

Detlef Riekenberg : libs/wine: Use xstrdup to avoid duplicate code.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 1c559eb4740a10dd717164bdf59b859c9f4c8772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c559eb4740a10dd717164bdf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 16 14:57:31 2007 +0100 libs/wine: Use xstrdup to avoid duplicate code. --- libs/wine/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 07ff07f..c3aab49 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -203,7 +203,7 @@ static void init_paths(void) if (prefix) { - if (!(config_dir = strdup( prefix ))) fatal_error( "virtual memory exhausted\n"); + config_dir = xstrdup( prefix ); remove_trailing_slashes( config_dir ); if (config_dir[0] != '/') fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix );

1 0

Hans Leidekker : wine.inf: Open/print .rtf files with wordpad.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 58e5ea2cfdd012ede478535bb799ab23fe4fdcac URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e5ea2cfdd012ede478535bb… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Mar 16 13:55:39 2007 +0100 wine.inf: Open/print .rtf files with wordpad. --- tools/wine.inf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 00fa586..713b0a5 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -97,6 +97,7 @@ HKCR,.ini,,2,"inifile" HKCR,.jfif,"Content Type",2,"image/jpeg" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" +HKCR,.rtf,,2,"rtffile" HKCR,.tif,"Content Type",2,"image/tiff" HKCR,.tiff,"Content Type",2,"image/tiff" HKCR,.txt,,2,"txtfile" @@ -124,6 +125,8 @@ HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i %1" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f %1" HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x %1" +HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" +HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1"

1 0

Hans Leidekker : wine.inf: Register an 'install' verb with the shell for . inf files.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 8530d23754f943f3a8538cc9e1c90114e8bfeb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8530d23754f943f3a8538cc9e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Mar 16 13:55:28 2007 +0100 wine.inf: Register an 'install' verb with the shell for .inf files. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 4475cbb..00fa586 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -92,6 +92,7 @@ HKCR,.htm,,2,"htmlfile" HKCR,.htm,"Content Type",2,"text/html" HKCR,.html,,2,"htmlfile" HKCR,.html,"Content Type",2,"text/html" +HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" HKCR,.jfif,"Content Type",2,"image/jpeg" HKCR,.lnk,,2,"lnkfile" @@ -110,6 +111,7 @@ HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,hlpfile\shell\open\command,,2,"%10%\winhelp.exe %1" HKCR,htmlfile\shell\open\command,,2,"winebrowser" +HKCR,inffile\shell\install\command,,2,"%10%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,lnkfile,,2,"Shortcut"

1 0

Juan Lang : advapi32: Implement RegGetKeySecurity with NtQuerySecurityObject.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 81e7d69dfddbc7e88818acfde31c3ee7ed4aa616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e7d69dfddbc7e88818acfde… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Mar 16 12:21:03 2007 -0700 advapi32: Implement RegGetKeySecurity with NtQuerySecurityObject. --- dlls/advapi32/registry.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7f673c0..8a70f56 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2232,21 +2232,11 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInformati TRACE("(%p,%d,%p,%d)\n",hkey,SecurityInformation,pSecurityDescriptor, lpcbSecurityDescriptor?*lpcbSecurityDescriptor:0); - /* FIXME: Check for valid SecurityInformation values */ - - if (*lpcbSecurityDescriptor < sizeof(SECURITY_DESCRIPTOR)) { - *lpcbSecurityDescriptor = sizeof(SECURITY_DESCRIPTOR); - return ERROR_INSUFFICIENT_BUFFER; - } - - FIXME("(%p,%d,%p,%d): stub\n",hkey,SecurityInformation, - pSecurityDescriptor,lpcbSecurityDescriptor?*lpcbSecurityDescriptor:0); - - /* Do not leave security descriptor filled with garbage */ - RtlCreateSecurityDescriptor(pSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; - *lpcbSecurityDescriptor = sizeof(SECURITY_DESCRIPTOR); - return ERROR_SUCCESS; + return RtlNtStatusToDosError( NtQuerySecurityObject( hkey, + SecurityInformation, pSecurityDescriptor, + *lpcbSecurityDescriptor, lpcbSecurityDescriptor ) ); }

1 0

Huw Davies : user32: Use a window's icon in preference to its class icon.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 7a43e790874106d58f0b92cc914c06271585a993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a43e790874106d58f0b92cc9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 16 14:53:16 2007 +0000 user32: Use a window's icon in preference to its class icon. --- dlls/user32/mdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 8da2060..976bce3 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -853,9 +853,9 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D ); /* The system menu is replaced by the child icon */ - hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM); + hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0); if (!hIcon) - hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); + hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); if (hIcon)

1 0

appdb/. viewbugs.php
by WineHQ March 17, 2007

March 17, 2007

ChangeSet ID: 30979 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/17 14:19:19 Modified files: . : viewbugs.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Show downloads on 'Apps affected by this bug' page Patch: http://cvs.winehq.org/patch.py?id=30979 Old revision New revision Changes Path 1.11 1.12 +12 -2 appdb/viewbugs.php Index: appdb/viewbugs.php diff -u -p appdb/viewbugs.php:1.11 appdb/viewbugs.php:1.12 --- appdb/viewbugs.php:1.11 17 Mar 2007 19:19:19 -0000 +++ appdb/viewbugs.php 17 Mar 2007 19:19:19 -0000 @@ -26,6 +26,7 @@ if(!is_numeric($aClean['iBugId'])) echo ' <td width=80>Application Name</td>',"\n"; echo ' <td>Description</td>',"\n"; echo ' <td width=80>version</td>',"\n"; + echo ' <td>Downloads</td>',"\n"; echo '</tr>',"\n"; @@ -43,6 +44,14 @@ if(!is_numeric($aClean['iBugId'])) { while($oRow = mysql_fetch_object($hResult)) { + $sDownloadUrls = ""; + if($hDownloadUrls = appData::getData($oRow->versionId, "downloadurl")) + { + while($oDownloadUrl = mysql_fetch_object($hDownloadUrls)) + $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">". + "$oDownloadUrl->description</a><br />"; + } + // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; echo '<tr class='.$bgcolor.'>',"\n"; @@ -53,6 +62,7 @@ if(!is_numeric($aClean['iBugId'])) echo ' <td>',"\n"; echo ' <a href="appview.php?iVersionId='.$oRow->versionId.'">'.$oRow->versionName.'</a>',"\n"; echo ' </td>',"\n"; + echo " <td>$sDownloadUrls</td>\n"; echo '</tr>',"\n"; } } @@ -63,13 +73,13 @@ if(!is_numeric($aClean['iBugId'])) echo '</tr>',"\n"; echo '<tr class=color4>',"\n"; - echo ' <td colspan=3 >&nbsp Bug #</td>',"\n"; + echo ' <td colspan=4 >&nbsp Bug #</td>',"\n"; echo '</tr>',"\n"; echo '<tr class=color3>',"\n"; echo ' <td align=center>',"\n"; echo ' <input type="text" name="iBugId" value="'.$aClean['iBugId'].'" size="8"></td>',"\n"; - echo ' <td colspan=2><input type="submit" name="sSub" value="Search"></td>',"\n"; + echo ' <td colspan=3><input type="submit" name="sSub" value="Search"></td>',"\n"; echo '</tr>',"\n"; echo '</table>',"\n";

1 0

appdb/. appsubmit.php
by WineHQ March 16, 2007

March 16, 2007

ChangeSet ID: 30978 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/16 19:53:17 Modified files: . : appsubmit.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix handling of rejected applications Patch: http://cvs.winehq.org/patch.py?id=30978 Old revision New revision Changes Path 1.64 1.65 +3 -2 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.64 appdb/appsubmit.php:1.65 --- appdb/appsubmit.php:1.64 17 Mar 2007 0:53:17 -0000 +++ appdb/appsubmit.php 17 Mar 2007 0:53:17 -0000 @@ -271,10 +271,11 @@ if ($aClean['sSub']) } if ($aClean['sSub'] == 'view' && - ($aClean['sAppName'] || $aClean['sAppType'] != "application")) + ($aClean['sAppName'] || $aClean['iAppId'] || $aClean['sAppType'] != "application")) { /* The appname is already entered in the potential duplicates step */ - $oApp->sName = $aClean['sAppName']; + if(!$oApp->sName) + $oApp->sName = $aClean['sAppName']; $x = new TableVE("view"); apidb_header("Application Queue");

1 0

appdb/include util.php
by WineHQ March 16, 2007

March 16, 2007

ChangeSet ID: 30977 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/16 19:51:59 Modified files: include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix ambiguous query Patch: http://cvs.winehq.org/patch.py?id=30977 Old revision New revision Changes Path 1.84 1.85 +1 -1 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.84 appdb/include/util.php:1.85 --- appdb/include/util.php:1.84 17 Mar 2007 0:51:59 -0000 +++ appdb/include/util.php 17 Mar 2007 0:51:59 -0000 @@ -431,7 +431,7 @@ function searchForApplication($search_wo FROM appFamily, vendor WHERE appName != 'NONAME' AND appFamily.vendorId = vendor.vendorId - AND queued = 'false' + AND appFamily.queued = 'false' AND (appName LIKE '%".mysql_real_escape_string($search_words)."%' OR keywords LIKE '%".mysql_real_escape_string($search_words)."%'";

1 0