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

appdb/ include/maintainer.php unit_test/test_m ...
by WineHQ 16 Apr '07

16 Apr '07

ChangeSet ID: 31045 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/16 18:19:44 Modified files: include : maintainer.php unit_test : test_maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix maintainer listing for versions. getMaintainersForAppIdVersionId() did not check that additional entries had a superMaintainer = 1 so a maintainer of one version would be listed as the maintainer for all versions of the application. Correct that issue and update the unit test. Patch: http://cvs.winehq.org/patch.py?id=31045 Old revision New revision Changes Path 1.38 1.39 +13 -3 appdb/include/maintainer.php 1.9 1.10 +15 -2 appdb/unit_test/test_maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.38 appdb/include/maintainer.php:1.39 --- appdb/include/maintainer.php:1.38 16 Apr 2007 23:19:44 -0000 +++ appdb/include/maintainer.php 16 Apr 2007 23:19:44 -0000 @@ -396,9 +396,19 @@ class maintainer if($iVersionId) { $hResult = query_parameters("SELECT userId from appMaintainers, appVersion - WHERE appMaintainers.queued = 'false' AND appVersion.versionId = '?' - AND ((appMaintainers.versionId = appVersion.versionId) OR - (appMaintainers.appId = appVersion.appId))", $iVersionId); + WHERE + appMaintainers.queued = 'false' + AND + appVersion.versionId = '?' + AND + ( + appMaintainers.versionId = appVersion.versionId + OR + ( + appMaintainers.appId = appVersion.appId + AND superMaintainer = '1' + ) + )", $iVersionId); } /* * If versionId was not supplied we fetch supermaintainers of application and maintainer of all versions. Index: appdb/unit_test/test_maintainer.php diff -u -p appdb/unit_test/test_maintainer.php:1.9 appdb/unit_test/test_maintainer.php:1.10 --- appdb/unit_test/test_maintainer.php:1.9 16 Apr 2007 23:19:44 -0000 +++ appdb/unit_test/test_maintainer.php 16 Apr 2007 23:19:44 -0000 @@ -461,6 +461,10 @@ function test_maintainer_getMaintainersF $oUser->addPriv("admin"); + $oSecondUser = new user(); + $oSecondUser->iUserId = $oUser->iUserId + 1; + $oSecondUser->addPriv("admin"); + $oApp = new application(); $oApp->create(); $oFirstVersion = new version(); @@ -519,6 +523,15 @@ function test_maintainer_getMaintainersF $oFirstVersionMaintainer->iUserId = $oUser->iUserId; $oFirstVersionMaintainer->create(); + /* Become a maintainer for the other version */ + $oSecondVersionMaintainer = new maintainer(); + $oSecondVersionMaintainer->sMaintainReason = "I need it"; + $oSecondVersionMaintainer->iVersionId = $oSecondVersion->iVersionId; + $oSecondVersionMaintainer->iAppId = $oFirstVersion->iAppId; + $oSecondVersionMaintainer->bSuperMaintainer = FALSE; + $oSecondVersionMaintainer->iUserId = $oSecondUser->iUserId; + $oSecondVersionMaintainer->create(); + if(!$hResult = maintainer::getMaintainersForAppIdVersionId(null, $oFirstVersion->iVersionId)) { @@ -542,8 +555,8 @@ function test_maintainer_getMaintainersF return FALSE; } - /* The second version should not have any maintainers */ - $iExpected = 0; + /* The second version should have 1 maintainer */ + $iExpected = 1; $iReceived = mysql_num_rows($hResult); if($iExpected != $iReceived) {

1 0

appdb/include distribution.php testData.php ve ...
by WineHQ 16 Apr '07

16 Apr '07

ChangeSet ID: 31044 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/16 18:10:08 Modified files: include : distribution.php testData.php version.php Added files: include : testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use objectManager for new test results Patch: http://cvs.winehq.org/patch.py?id=31044 Old revision New revision Changes Path 1.21 1.22 +7 -3 appdb/include/distribution.php 1.38 1.39 +18 -18 appdb/include/testData.php 1.114 1.115 +3 -1 appdb/include/version.php Added 1.1 +0 -0 appdb/include/testData_queue.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.21 appdb/include/distribution.php:1.22 --- appdb/include/distribution.php:1.21 16 Apr 2007 23:10: 8 -0000 +++ appdb/include/distribution.php 16 Apr 2007 23:10: 8 -0000 @@ -347,12 +347,16 @@ class distribution { // Name echo '<tr valign=top><td class="color1" width="20%"><b>Distribution Name</b></td>',"\n"; - echo '<td class="color0"><input type=text name="sName" value="'.$this->sName.'" size="50"></td></tr>',"\n"; + echo '<td class="color0"><input type=text name="sDistribution" value="'.$this->sName.'" size="50"></td></tr>',"\n"; // Url echo '<tr valign=top><td class="color1"><b>Distribution Url</b></td>',"\n"; echo '<td class="color0"><input type=text name="sUrl" value="'.$this->sUrl.'" size="50"></td></tr>',"\n"; - echo '<input type="hidden" name="iDistributionId" value="'.$this->iDistributionId.'">',"\n"; + if($this->iDistributionId) + { + echo '<input type="hidden" name="iDistributionId" '. + 'value="'.$this->iDistributionId.'">',"\n"; + } echo "</table>\n"; } @@ -362,7 +366,7 @@ class distribution { function GetOutputEditorValues($aValues) { $this->iDistributionId = $aValues['iDistributionId']; - $this->sName = $aValues['sName']; + $this->sName = $aValues['sDistribution']; $this->sUrl = $aValues['sUrl']; } Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.38 appdb/include/testData.php:1.39 --- appdb/include/testData.php:1.38 16 Apr 2007 23:10: 8 -0000 +++ appdb/include/testData.php 16 Apr 2007 23:10: 8 -0000 @@ -63,15 +63,6 @@ class testData{ // Creates a new Test Results. function create() { - // Security, if we are not an administrator or a maintainer the test result must be queued. - $oVersion = new Version($this->iVersionId); - if(!$_SESSION['current']->hasPriv("admin") && - !$_SESSION['current']->hasAppVersionModifyPermission($oVersion)) - $this->sQueued = 'true'; - else - $this->sQueued = 'false'; - - $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". "installs, runs, testedRating, comments, submitterId, queued)". @@ -80,8 +71,9 @@ class testData{ $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, $this->sInstalls, $this->sRuns, - $this->sTestedRating, $this->sComments, $_SESSION['current']->iUserId, - $this->sQueued); + $this->sTestedRating, $this->sComments, + $_SESSION['current']->iUserId, + $this->canEdit() ? "false" : "true"); if($hResult) { $this->iTestingId = mysql_insert_id(); @@ -489,8 +481,16 @@ class testData{ } // show the fields for editing - function outputEditor($sDistribution="", $bNewDist=false) + function outputEditor() { + global $aClean; + + /* Fill in some values */ + if(!$this->iVersionId) + $this->iVersionId = $aClean['iVersionId']; + if(!$this->sTestedDate) + $this->sTestedDate = date('Y-m-d H:i:s'); + HtmlAreaLoaderScript(array("Test1", "Test2", "Test3")); $sName = version::fullName($this->iVersionId); @@ -516,11 +516,11 @@ class testData{ echo '<tr valign=top><td class="color1"></td><td class="color0"><p/>YYYY-MM-DD HH:MM:SS</td></tr>',"\n"; // Distribution echo '<tr valign=top><td class="color0"><b>Distribution</b></td class="color0">',"\n"; - if ($bNewDist) - { - echo '<td class="color0"><input type=text name="sDistribution" value="'.$sDistribution.'" size="20"></td></tr>',"\n"; - echo '<tr><td class=color0><b></b></td>',"\n"; - } + + echo '<td class="color0">If yours is not on the list, please add it using the form '. + 'below</td></tr>',"\n"; + echo '<tr><td class=color0><b></b></td>',"\n"; + echo '<td class=color0>',"\n"; distribution::make_distribution_list("iDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; @@ -823,7 +823,7 @@ class testData{ { if($_SESSION['current']->hasPriv("admin")) return TRUE; - else if($this->iTestingId) + else if($this->iVersionId) { $oVersion = new version($this->iVersionId); if($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.114 appdb/include/version.php:1.115 --- appdb/include/version.php:1.114 16 Apr 2007 23:10: 8 -0000 +++ appdb/include/version.php 16 Apr 2007 23:10: 8 -0000 @@ -897,7 +897,9 @@ class Version { } if($_SESSION['current']->isLoggedIn()) { - echo '<form method=post name=sMessage action=testResults.php?sSub=view&iVersionId='.$this->iVersionId.'>'; + echo '<form method=post name=sMessage action=objectManager.php?'. + 'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId. + '&sTitle=Add+Test+Data>'; echo '<input type=submit value="Add Test Data" class="button" />'; echo '</form>'; } else Index: appdb/include/testData_queue.php diff -u -p /dev/null appdb/include/testData_queue.php:1.1 --- /dev/null 16 Apr 2007 23:10: 8 -0000 +++ appdb/include/testData_queue.php 16 Apr 2007 23:10: 8 -0000 @@ -0,0 +1,62 @@ +<?php + +class testData_queue +{ + var $oTestData; + var $oDistribution; + + function testData_queue($iTestId = null) + { + $this->oTestData = new testData($iTestId); + $this->oDistribution = new distribution($this->oTestData->iDistributionId); + } + + function create() + { + if(!$this->oTestData->iDistributionId) + { + $this->oDistribution->create(); + $this->oTestData->iDistributionId = $this->oDistribution->iDistributionId; + } + $this->oTestData->create(); + } + + function update() + { + $this->oTestData->update(); + $this->oDistribution->update(); + } + + function outputEditor() + { + $this->oTestData->outputEditor(); + + /* If the testData is already associated with a distribution and the distribution is + un-queued, there is no need to display the distribution form here */ + if(!$this->oTestData->iDistributionId or $this->oDistributionId->sQueued != "false") + $this->oDistribution->outputEditor(); + } + + function getOutputEditorValues($aClean) + { + $this->oTestData->getOutputEditorValues($aClean); + $this->oDistribution->getOutputEditorValues($aClean); + } + + function checkOutputEditorInput($aClean) + { + return $this->oTestData->checkOutputEditorInput($aClean); + } + + function canEdit() + { + return $this->oTestData->canEdit(); + } + + function objectDisplayAddItemHelp() + { + $this->oTestData->objectDisplayAddItemHelp(); + } +} + +?>

1 0

appdb/include application.php url.php
by WineHQ 16 Apr '07

16 Apr '07

ChangeSet ID: 31043 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/16 17:59:48 Modified files: include : application.php url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix url::canEdit() to not call undefined functions Patch: http://cvs.winehq.org/patch.py?id=31043 Old revision New revision Changes Path 1.101 1.102 +2 -0 appdb/include/application.php 1.15 1.16 +9 -8 appdb/include/url.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.101 appdb/include/application.php:1.102 --- appdb/include/application.php:1.101 16 Apr 2007 22:59:48 -0000 +++ appdb/include/application.php 16 Apr 2007 22:59:48 -0000 @@ -903,6 +903,8 @@ class Application { { if($_SESSION['current']->hasPriv("admin")) return TRUE; + else if($this) + return maintainer::isUserSuperMaintainer($_SESSION['current'], $this->iAppId); else return FALSE; } Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.15 appdb/include/url.php:1.16 --- appdb/include/url.php:1.15 16 Apr 2007 22:59:48 -0000 +++ appdb/include/url.php 16 Apr 2007 22:59:48 -0000 @@ -453,17 +453,18 @@ class Url { function canEdit($iVersionId, $iAppId = NULL) { - $oUser = new User($_SESSION['current']->iUserId); - - if($oUser->hasPriv("admin") || ($iVersionId && - maintainer::isUserMaintainer($oUser, $iVersionId)) || ($iAppId && - maintainer::isSuperMaintainer($oUser, $iAppId))) - { + if($_SESSION['current']->hasPriv("admin")) return TRUE; - } else + else if($iVersionId) { + $oVersion = new version($iVersionId); + return $oVersion->canEdit(); + } else if($iAppId) + { + $oApp = new application($iAppId); + return $oApp->canEdit(); + } else return FALSE; - } } /* Display links for a given version/application */

1 0

lostwages/ news/2007041601.xml wwn/wn20070416_ ...
by WineHQ 16 Apr '07

16 Apr '07

ChangeSet ID: 31042 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/04/16 13:13:10 Added files: news : 2007041601.xml wwn : wn20070416_329.xml Log message: WWN #329 Patch: http://cvs.winehq.org/patch.py?id=31042 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007041601.xml Added 1.1 +0 -0 lostwages/wwn/wn20070416_329.xml

1 0

Jan Zerebecki : wined3d: Remove resourceStoreCriticalSection.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 58c7c514858aecf6432c971164218641a61fdb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c7c514858aecf6432c97116… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Apr 16 09:54:36 2007 +0200 wined3d: Remove resourceStoreCriticalSection. --- dlls/wined3d/device.c | 15 --------------- dlls/wined3d/wined3d_main.c | 7 ------- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 51fcfb3..dd9d320 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5807,9 +5807,6 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 ResourceList* resourceList; TRACE("(%p) : resource %p\n", This, resource); -#if 0 - EnterCriticalSection(&resourceStoreCriticalSection); -#endif /* add a new texture to the frot of the linked list */ resourceList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ResourceList)); resourceList->resource = resource; @@ -5820,9 +5817,6 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 This->resources = resourceList; TRACE("Added resource %p with element %p pointing to %p\n", resource, resourceList, resourceList->next); -#if 0 - LeaveCriticalSection(&resourceStoreCriticalSection); -#endif return; } @@ -5833,9 +5827,6 @@ static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWin TRACE("(%p) : resource %p\n", This, resource); -#if 0 - EnterCriticalSection(&resourceStoreCriticalSection); -#endif resourceList = This->resources; while (resourceList != NULL) { @@ -5846,9 +5837,6 @@ static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWin if (resourceList == NULL) { FIXME("Attempted to remove resource %p that hasn't been stored\n", resource); -#if 0 - LeaveCriticalSection(&resourceStoreCriticalSection); -#endif return; } else { TRACE("Found resource %p with element %p pointing to %p (previous %p)\n", resourceList->resource, resourceList, resourceList->next, previousResourceList); @@ -5860,9 +5848,6 @@ static void WINAPI IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWin This->resources = resourceList->next; } -#if 0 - LeaveCriticalSection(&resourceStoreCriticalSection); -#endif return; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 965d95d..5d00ba8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -46,17 +46,14 @@ wined3d_settings_t wined3d_settings = }; WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; -CRITICAL_SECTION resourceStoreCriticalSection; long globalChangeGlRam(long glram){ /* FIXME: replace this function with object tracking */ int result; - EnterCriticalSection(&resourceStoreCriticalSection); /* this is overkill really, but I suppose it should be thread safe */ wineD3DGlobalStatistics->glsurfaceram += glram; TRACE("Adjusted gl ram by %ld to %d\n", glram, wineD3DGlobalStatistics->glsurfaceram); result = wineD3DGlobalStatistics->glsurfaceram; - LeaveCriticalSection(&resourceStoreCriticalSection); return result; } @@ -68,10 +65,6 @@ IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *p object->ref = 1; object->parent = parent; - /* TODO: Move this off to device and possibly x11drv */ - /* Create a critical section for a dll global data store */ - InitializeCriticalSectionAndSpinCount(&resourceStoreCriticalSection, 0x80000400); - /*Create a structure for storing global data in*/ if(wineD3DGlobalStatistics == NULL){ TRACE("Creating global statistics store\n");

1 0

Eric Pouech : acledit: Stubbed out acledit DLL, needed by SysInternals process explorer.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 0da02fb2465ff5a291dcc5e2c24200e8a5ff2cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da02fb2465ff5a291dcc5e2c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Apr 16 09:22:03 2007 +0200 acledit: Stubbed out acledit DLL, needed by SysInternals process explorer. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/acledit/Makefile.in | 13 +++++++++++ dlls/acledit/acledit.spec | 8 +++++++ dlls/acledit/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 79 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7fa8ef0..541ff0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -157,6 +157,7 @@ ALL_MAKEFILES = \ dlls/Maketest.rules \ programs/Makeprog.rules \ dlls/Makefile \ + dlls/acledit/Makefile \ dlls/activeds/Makefile \ dlls/advapi32/Makefile \ dlls/advapi32/tests/Makefile \ @@ -498,6 +499,7 @@ dlls/Maketest.rules: dlls/Maketest.rules.in Make.rules programs/Makeprog.rules: programs/Makeprog.rules.in Make.rules Makefile: Makefile.in Make.rules dlls/Makefile: dlls/Makefile.in Make.rules +dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index 85b24c5..e086a93 100755 --- a/configure +++ b/configure @@ -20203,6 +20203,8 @@ ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files dlls/Makefile" +ac_config_files="$ac_config_files dlls/acledit/Makefile" + ac_config_files="$ac_config_files dlls/activeds/Makefile" ac_config_files="$ac_config_files dlls/advapi32/Makefile" @@ -21422,6 +21424,7 @@ do "programs/Makeprog.rules") CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "dlls/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;; + "dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;; "dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;; "dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;; "dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index c9766dc..5f718c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1492,6 +1492,7 @@ AC_CONFIG_FILES([dlls/Maketest.rules]) AC_CONFIG_FILES([programs/Makeprog.rules]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([dlls/Makefile]) +AC_CONFIG_FILES([dlls/acledit/Makefile]) AC_CONFIG_FILES([dlls/activeds/Makefile]) AC_CONFIG_FILES([dlls/advapi32/Makefile]) AC_CONFIG_FILES([dlls/advapi32/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a0dcea0..f465d7a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -16,6 +16,7 @@ EXTRADIRS = @GLU32FILES@ @OPENGLFILES@ @QUARTZFILES@ @XFILES@ # Subdir list BASEDIRS = \ + acledit \ activeds \ advapi32 \ advpack \ diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in new file mode 100644 index 0000000..083cd0b --- /dev/null +++ b/dlls/acledit/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = acledit.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec new file mode 100644 index 0000000..e33cc59 --- /dev/null +++ b/dlls/acledit/acledit.spec @@ -0,0 +1,8 @@ +1 stub EditAuditInfo +2 stub EditOwnerInfo +3 stub EditPermissionInfo +4 stdcall DllMain(long long ptr) +5 stub FMExtensionProcW +6 stub SedDiscretionaryAclEditor +7 stub SedSystemAclEditor +8 stub SedTakeOwnership diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c new file mode 100644 index 0000000..ca6836a --- /dev/null +++ b/dlls/acledit/main.c @@ -0,0 +1,51 @@ +/* + * Implementation of the AclEdit Interface + * + * Copyright 2006 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(acledit); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +}

1 0

Jan Zerebecki : user32: Fix to succeed reliably in test where it works by accident.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: d553159eace9c9fddab32caf503648290ab2550a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d553159eace9c9fddab32caf5… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Mon Apr 16 09:54:14 2007 +0200 user32: Fix to succeed reliably in test where it works by accident. --- dlls/user32/cursoricon.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 38e2ac6..63465ca 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1796,6 +1796,8 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) iconinfo->hbmColor, iconinfo->hbmMask, iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); + if (!iconinfo->hbmMask) return 0; + if (iconinfo->hbmColor) { GetObjectW( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor );

1 0

Alban Browaeys : msi: Move msi_free(msiFilePath) to enable ERR message to use it before it is freed.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 7aa39178235d713696f17341a9e7c55f317022cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa39178235d713696f17341a… Author: Alban Browaeys <prahal(a)yahoo.com> Date: Sun Apr 15 12:11:38 2007 +0200 msi: Move msi_free(msiFilePath) to enable ERR message to use it before it is freed. --- dlls/msi/action.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f047a27..c3e65d2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3679,14 +3679,15 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) msiFilePath = msi_dup_property( package, szOriginalDatabase ); r = CopyFileW( msiFilePath, packagefile, FALSE); - msi_free( msiFilePath ); if (!r) { ERR("Unable to copy package (%s -> %s) (error %d)\n", debugstr_w(msiFilePath), debugstr_w(packagefile), GetLastError()); + msi_free( msiFilePath ); return ERROR_FUNCTION_FAILED; } + msi_free( msiFilePath ); /* FIXME: maybe set this key in ACTION_RegisterProduct instead */ msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile );

1 0

Alban Browaeys : wininet: Fix szCacheContent in URLCacheContainer_OpenIndex .
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 3d79f1b80b24cdd5e31fbdee3d4b3606efea7a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d79f1b80b24cdd5e31fbdee3… Author: Alban Browaeys <prahal(a)yahoo.com> Date: Sun Apr 15 15:49:04 2007 +0200 wininet: Fix szCacheContent in URLCacheContainer_OpenIndex. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ec895a2..ca38141 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -253,7 +253,7 @@ static BOOL URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) if (dwFileSize == 0) { - static CHAR const szCacheContent[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Cache\\Content"; + static const CHAR szCacheContent[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Cache\\Content"; HKEY key; char achZeroes[0x1000]; DWORD dwOffset;

1 0

Damjan Jovanovic : mapi32: MAPIAdminProfiles stub.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: fdb368789c0413e4173a231136b850dc72518599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb368789c0413e4173a23113… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 16 10:44:19 2007 +0200 mapi32: MAPIAdminProfiles stub. --- dlls/mapi32/mapi32.spec | 4 ++-- dlls/mapi32/mapi32_main.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 4798e69..7292e52 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -7,8 +7,8 @@ 15 stdcall MAPIAllocateMore(a)12(long ptr ptr) MAPIAllocateMore 16 stdcall MAPIFreeBuffer(ptr) 17 stdcall MAPIFreeBuffer(a)4(ptr) MAPIFreeBuffer - 18 stub MAPIAdminProfiles - 19 stub MAPIAdminProfiles(a)8 + 18 stdcall MAPIAdminProfiles(long ptr) + 19 stdcall MAPIAdminProfiles(a)8(long ptr) MAPIAdminProfiles 20 stdcall MAPIInitialize(ptr) 21 stdcall MAPIInitialize(a)4(ptr) MAPIInitialize 22 stdcall MAPIUninitialize() diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index e2bdebf..983dc24 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -110,3 +110,10 @@ VOID WINAPI MAPIUninitialize(void) { FIXME("Stub\n"); } + +HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) +{ + FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); + *lppProfAdmin = NULL; + return E_FAIL; +}

1 0