April 2007 - Wine-commits - list.winehq.org

Peter Beutner : ntdll: Remove one exception test.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: 86cbbaf930713c0c4c6e400fc5e01c8165e6a045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cbbaf930713c0c4c6e400fc… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Wed Apr 4 21:29:14 2007 +0200 ntdll: Remove one exception test. --- dlls/ntdll/tests/exception.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 90aa3b6..9ebbda7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -494,7 +494,8 @@ static DWORD bpx_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD * ok( context->Eip == (DWORD)code_mem + 1, "eip is wrong: %x instead of %x\n", context->Eip, (DWORD)code_mem + 1); todo_wine{ ok( (context->Dr6 & 0x4000), "BS flag is not set in Dr6\n"); }; - ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); + /* depending on the win version the B0 bit is already set here as well + ok( (context->Dr6 & 0xf) == 0, "B0...3 flags in Dr6 shouldn't be set\n"); */ context->EFlags |= 0x100; } else if( got_exception == 3) { /* hw bp exception on second nop */

1 0

Aric Stewart : ole32: Storage optimization.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: 6230222aab6caacdcd5673c3c4c896fc3e80643d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6230222aab6caacdcd5673c3c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 4 13:15:28 2007 -0500 ole32: Storage optimization. We do not need to unmap and remap all the victim pages with every resize as they are simply a cache. Provides significant speedup for saving large storage files. --- dlls/ole32/stg_bigblockfile.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 83454d4..4f22207 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -114,6 +114,7 @@ static MappedPage* BIGBLOCKFILE_CreatePage(LPBIGBLOCKFILE This, static DWORD BIGBLOCKFILE_GetProtectMode(DWORD openFlags); static BOOL BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile); static BOOL BIGBLOCKFILE_MemInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt); +static void BIGBLOCKFILE_DeleteList(LPBIGBLOCKFILE This, MappedPage *list); /* Note that this evaluates a and b multiple times, so don't * pass expressions with side effects. */ @@ -356,7 +357,15 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize) TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); /* * unmap all views, must be done before call to SetEndFile + * + * Just ditch the victim list because there is no guarentee we will need them + * and it is not worth the performance hit to unmap and remap them all. */ + BIGBLOCKFILE_DeleteList(This, This->victimhead); + This->victimhead = NULL; + This->victimtail = NULL; + This->num_victim_pages = 0; + BIGBLOCKFILE_UnmapAllMappedPages(This); if (This->fileBased)

1 0

Stefan Leichter : advapi32: Add some tests for RegDeleteTreeA.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: 0dcf196001f94aa8a864fd5ac46f4adde7076c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcf196001f94aa8a864fd5ac… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 4 23:03:00 2007 +0200 advapi32: Add some tests for RegDeleteTreeA. --- dlls/advapi32/tests/registry.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a3491c3..1d9fab6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -35,6 +35,7 @@ static const char * sTestpath2 = "%FOO%\\subdir1"; static HMODULE hadvapi32; static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); +static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); #define ADVAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hadvapi32, #func); \ @@ -47,6 +48,7 @@ static void InitFunctionPtrs(void) /* This function was introduced with Windows 2003 SP1 */ ADVAPI32_GET_PROC(RegGetValueA) + ADVAPI32_GET_PROC(RegDeleteTreeA) } /* delete key and all its subkeys */ @@ -892,6 +894,62 @@ cleanup: RegCloseKey(subkey); } +static void test_reg_delete_tree(void) +{ + CHAR buffer[MAX_PATH]; + HKEY subkey, subkey2; + LONG size, ret; + + if(!pRegDeleteTreeA) { + skip("Skipping RegDeleteTreeA tests, function not present\n"); + return; + } + + ret = RegCreateKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey2, NULL, REG_SZ, "data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = pRegDeleteTreeA(subkey, "subkey2"); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + size = MAX_PATH; + ok(!RegQueryValueA(subkey, NULL, buffer, &size), + "Default value of subkey not longer present\n"); + + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = pRegDeleteTreeA(hkey_main, "subkey\\subkey2"); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + ok(!RegQueryValueA(subkey, NULL, buffer, &size), + "Default value of subkey not longer present\n"); + + ret = pRegDeleteTreeA(subkey, NULL); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!RegOpenKeyA(hkey_main, "subkey", &subkey), + "subkey was deleted\n"); + ret = RegQueryValueA(subkey, NULL, buffer, &size); + ok(ret == ERROR_SUCCESS, + "Default value of subkey is not present\n"); + ok(!lstrlenA(buffer), + "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + + ret = pRegDeleteTreeA(hkey_main, "not-here"); + ok(ret == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -921,6 +979,8 @@ START_TEST(registry) set_privileges(SE_RESTORE_NAME, FALSE); } + test_reg_delete_tree(); + /* cleanup */ delete_key( hkey_main );

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: fc5f6d4bdc351b370406f4070963f38f41d0fda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5f6d4bdc351b370406f4070… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 4 22:22:20 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/cdlg.h | 6 ++-- dlls/comdlg32/colordlg.c | 48 +++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc5f6d4bdc351b370406f…

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: 918c9d9ac1f5626f2f3918d7129d4be2931a2295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918c9d9ac1f5626f2f3918d71… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 4 22:22:44 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/filedlg.c | 10 +++++----- dlls/comdlg32/filedlg16.c | 16 ++++++++-------- dlls/comdlg32/filedlg31.c | 26 +++++++++++++------------- dlls/comdlg32/filedlg31.h | 26 +++++++++++++------------- 4 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=918c9d9ac1f5626f2f391…

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: 65479a24240438e11eea464a76c276e6a728d0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=65479a24240438e11eea464a7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 4 22:23:04 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/filedlgbrowser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 2ff2c81..f379425 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -76,7 +76,7 @@ static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; * Local Prototypes */ -static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv); +static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv); /* * Helper functions @@ -125,7 +125,7 @@ static void COMDLG32_DumpSBSPFlags(UINT uflags) } } -static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos) +static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) { LPSHELLFOLDER psfDesktop; STRRET strret; @@ -895,7 +895,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_OnSelChange */ -static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv) +static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv) { FileOpenDlgInfos *fodInfos;

1 0

Fabian Bieler : wined3d: Fix UpdateSurface for sourceRect != sourceWidth.
by Alexandre Julliard 05 Apr '07

05 Apr '07

Module: wine Branch: master Commit: fd6395f0c7d910971560c613d87ac44d6de5bc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6395f0c7d910971560c613d… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Sat Mar 31 13:01:48 2007 +0200 wined3d: Fix UpdateSurface for sourceRect != sourceWidth. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3bee323..d1224e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4823,14 +4823,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* This function doesn't support compressed textures the pitch is just bytesPerPixel * width */ if(srcWidth != srcSurfaceWidth || srcLeft ){ - rowoffset = (srcSurfaceWidth - srcWidth) * pSrcSurface->bytesPerPixel; + rowoffset = srcSurfaceWidth * pSrcSurface->bytesPerPixel; offset += srcLeft * pSrcSurface->bytesPerPixel; /* TODO: do we ever get 3bpp?, would a shift and an add be quicker than a mul (well maybe a cycle or two) */ } /* TODO DXT formats */ if(pSourceRect != NULL && pSourceRect->top != 0){ - offset += pSourceRect->top * srcWidth * pSrcSurface->bytesPerPixel; + offset += pSourceRect->top * srcSurfaceWidth * pSrcSurface->bytesPerPixel; } TRACE("(%p) glTexSubImage2D, Level %d, left %d, top %d, width %d, height %d , ftm %d, type %d, memory %p\n" ,This

1 0

appdb/include version.php
by WineHQ 05 Apr '07

05 Apr '07

ChangeSet ID: 31032 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/04 21:29:22 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> make version::objectGetEntriesCount() more consistent for rejected versions by not allowing maintainers to see rejected versions for applications they maintain Patch: http://cvs.winehq.org/patch.py?id=31032 Old revision New revision Changes Path 1.111 1.112 +34 -30 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.111 appdb/include/version.php:1.112 --- appdb/include/version.php:1.111 5 Apr 2007 2:29:22 -0000 +++ appdb/include/version.php 5 Apr 2007 2:29:22 -0000 @@ -1159,41 +1159,45 @@ class Version { if($bQueued && !version::canEdit()) { - /* Users should see their own rejected entries */ + /* Users should see their own rejected entries, but maintainers should + not be able to see rejected entries for versions they maintain */ if($bRejected) - $sIncludeUserSubmissions = "OR appVersion.submitterId = '". - $_SESSION['current']->iUserId."'"; - - $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM - appVersion, appMaintainers, appFamily WHERE - appFamily.appId = appVersion.appId - AND - appFamily.queued = 'false' - AND - ( + $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM + appVersion, appFamily WHERE + appFamily.appId = appVersion.appId + AND + appFamily.queued = 'false' + AND + appVersion.submitterId = '?' + AND + appVersion.queued = '?'"; + else + $sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM + appVersion, appMaintainers, appFamily WHERE + appFamily.appId = appVersion.appId + AND + appFamily.queued = 'false' + AND ( ( - ( - appMaintainers.appId = appVersion.appId - AND - superMaintainer = '1' - ) - OR - ( - appMaintainers.versionId = appVersion.versionId - AND - superMaintainer = '0' - ) + appMaintainers.appId = appVersion.appId + AND + superMaintainer = '1' + ) + OR + ( + appMaintainers.versionId = appVersion.versionId + AND + superMaintainer = '0' ) - AND - appMaintainers.userId = '?' - AND - appMaintainers.queued = 'false' ) - $sIncludeUserSubmissions - ) - AND - appVersion.queued = '?'"; + AND + appMaintainers.userId = '?' + AND + appMaintainers.queued = 'false' + AND + appVersion.queued = '?'"; + $hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sQueued); } else {

1 0

appdb/ ./appdbStats.php ./index.php include/ut ...
by WineHQ 05 Apr '07

05 Apr '07

ChangeSet ID: 31031 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/04 21:27:31 Modified files: . : appdbStats.php index.php include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectGetEntriesCount() in more places Patch: http://cvs.winehq.org/patch.py?id=31031 Old revision New revision Changes Path 1.16 1.17 +2 -2 appdb/appdbStats.php 1.44 1.45 +6 -5 appdb/index.php 1.85 1.86 +0 -25 appdb/include/util.php Index: appdb/appdbStats.php diff -u -p appdb/appdbStats.php:1.16 appdb/appdbStats.php:1.17 --- appdb/appdbStats.php:1.16 5 Apr 2007 2:27:31 -0000 +++ appdb/appdbStats.php 5 Apr 2007 2:27:31 -0000 @@ -56,13 +56,13 @@ echo "</tr>\n\n"; /* Display the number of application familes */ echo "<tr class=color4>\n"; echo " <td>Application families:</td>\n"; -echo " <td>".getNumberOfAppFamilies()."</td>\n"; +echo " <td>".application::objectGetEntriesCount(false, false)."</td>\n"; echo "</tr>\n\n"; /* Display the number of versions */ echo "<tr class=color4>\n"; echo " <td>Versions:</td>\n"; -echo " <td>".getNumberOfVersions()."</td>\n"; +echo " <td>".version::objectGetEntriesCount(false, false)."</td>\n"; echo "</tr>\n\n"; /* Display the number of application maintainers */ Index: appdb/index.php diff -u -p appdb/index.php:1.44 appdb/index.php:1.45 --- appdb/index.php:1.44 5 Apr 2007 2:27:31 -0000 +++ appdb/index.php 5 Apr 2007 2:27:31 -0000 @@ -57,7 +57,7 @@ If you have screenshots or links to cont <?php - $numApps = getNumberOfVersions(); + $iNumApps = version::objectGetEntriesCount(false, false); $voteQuery = "SELECT appVotes.versionId, count(userId) as count ". "FROM appVotes ". @@ -65,17 +65,18 @@ If you have screenshots or links to cont $hResult = query_parameters($voteQuery); $oRow = mysql_fetch_object($hResult); + echo "There are $iNumApps applications currently in the database"; + // don't mention the top application if there are no votes yet if($oRow->versionId) { $shVoteAppLink = version::fullNameLink($oRow->versionId); - echo "There are $numApps applications currently in the database with\n"; - echo "$shVoteAppLink being the\n"; + echo " with $shVoteAppLink being the\n"; echo "top <a href='votestats.php'>voted</a> application.\n"; } else { - echo "There are $numApps applications currently in the database, please\n"; - echo "<a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\" style=\"cursor: help\">vote</a> for your favourite application.\n"; + echo " please <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\"". + "style=\"cursor: help\">vote</a> for your favourite application.\n"; } ?> Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.85 appdb/include/util.php:1.86 --- appdb/include/util.php:1.85 5 Apr 2007 2:27:31 -0000 +++ appdb/include/util.php 5 Apr 2007 2:27:31 -0000 @@ -205,15 +205,6 @@ function make_maintainer_rating_list($va echo "</select>\n"; } -/* get the total number of vendors from the vendor table */ -function getVendorCount() -{ - $sQuery = "SELECT count(*) as vendors FROM vendor"; - $hResult = query_parameters($sQuery); - $oRow = mysql_fetch_object($hResult); - return $oRow->vendors; -} - /* Get the number of users in the database */ function getNumberOfComments() { @@ -222,22 +213,6 @@ function getNumberOfComments() return $oRow->num_comments; } -/* Get the number of versions in the database */ -function getNumberOfVersions() -{ - $hResult = query_parameters("SELECT count(versionId) as num_versions FROM appVersion WHERE versionName != 'NONAME';"); - $oRow = mysql_fetch_object($hResult); - return $oRow->num_versions; -} - -/* Get the number of app familes in the database */ -function getNumberOfAppFamilies() -{ - $hResult = query_parameters("SELECT count(*) as num_appfamilies FROM appFamily;"); - $oRow = mysql_fetch_object($hResult); - return $oRow->num_appfamilies; -} - /* Get the number of queued bug links in the database */ function getNumberOfQueuedBugLinks() {

1 0

Maarten Lankhorst : winearts.drv: Kill off winearts.
by Alexandre Julliard 04 Apr '07

04 Apr '07

1 0