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

appdb/include note.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31114 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:33:34 Modified files: include : note.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix note update mails to include changes again. Append the version url to the message text instead of overwriting it Patch: http://cvs.winehq.org/patch.py?id=31114 Old revision New revision Changes Path 1.24 1.25 +1 -1 appdb/include/note.php Index: appdb/include/note.php diff -u -p appdb/include/note.php:1.24 appdb/include/note.php:1.25 --- appdb/include/note.php:1.24 27 Apr 2007 23:33:34 -0000 +++ appdb/include/note.php 27 Apr 2007 23:33:34 -0000 @@ -139,7 +139,7 @@ class Note { { $oVersion = new version($this->iVersionId); $sAppName = version::fullName($this->iVersionId); - $sMsg = $oVersion->objectMakeUrl()."\n"; + $sMsg .= $oVersion->objectMakeUrl()."\n"; switch($sAction) { case "add":

1 0

appdb/include distribution.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31113 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:22:37 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow maintainers to submit un-queued distributions.They are allowed to submit un-queued testData for the versions they maintain, so without this change they submit un-queued test results associated with a queued distribution. This doesn't make any sense since the testData would be active but the distribution queued. It's cleaner to just let maintainers unqueue distributions for versions they maintain. Patch: http://cvs.winehq.org/patch.py?id=31113 Old revision New revision Changes Path 1.26 1.27 +16 -9 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.26 appdb/include/distribution.php:1.27 --- appdb/include/distribution.php:1.26 27 Apr 2007 23:22:37 -0000 +++ appdb/include/distribution.php 27 Apr 2007 23:22:37 -0000 @@ -135,9 +135,11 @@ class distribution { // Delete Distributution. function delete($bSilent=false) { - // is the current user allowed to delete this Distribution? - if(!$_SESSION['current']->hasPriv("admin") && - !($_SESSION['current']->iUserId == $this->iSubmitterId)) + /* Is the current user allowed to delete this distribution? We allow + everyone to delete a queued, empty distribution, because it should be + deleted along with the last testData associated with it */ + if(!($this->canEdit() || (!sizeof($this->aTestingIds) && + $this->sQueued != "false"))) return; /* Check for associated test results */ @@ -168,11 +170,9 @@ class distribution { // Move Distribution out of the queue. function unQueue() { - // is the current user allowed to move this Distribution? - if(!$_SESSION['current']->hasPriv("admin")) - { - return false; - } + /* Check permissions */ + if($this->mustBeQueued()) + return FALSE; // If we are not in the queue, we can't move the Distribution out of the queue. if(!$this->sQueued == 'true') @@ -481,12 +481,19 @@ class distribution { if($_SESSION['current']->hasPriv("admin")) return TRUE; + /* Maintainers are allowed to process queued test results and therefore also + queued distributions */ + if(is_object($this) && $this->sQueued != "false" && + maintainer::isUserMaintainer($_SESSION['current'])) + return TRUE; + return FALSE; } function mustBeQueued() { - if($_SESSION['current']->hasPriv("admin")) + if($_SESSION['current']->hasPriv("admin") || + maintainer::isUserMaintainer($_SESSION['current'])) return FALSE; else return TRUE;

1 0

appdb/. browse_downloadable.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31112 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:05:30 Modified files: . : browse_downloadable.php Log message: Fix page change on browse downloadable page. The URL for next/previous links should include the current license filter, otherwise the license selection is load on every page load Patch: http://cvs.winehq.org/patch.py?id=31112 Old revision New revision Changes Path 1.4 1.5 +2 -1 appdb/browse_downloadable.php Index: appdb/browse_downloadable.php diff -u -p appdb/browse_downloadable.php:1.4 appdb/browse_downloadable.php:1.5 --- appdb/browse_downloadable.php:1.4 27 Apr 2007 23: 5:30 -0000 +++ appdb/browse_downloadable.php 27 Apr 2007 23: 5:30 -0000 @@ -49,7 +49,8 @@ $iLimitLower = ($aClean['iPage'] - 1) * echo "<div align=\"center\">\n"; echo "<b>Page ".$aClean['iPage']." of $iNumPages</b><br />\n"; display_page_range($aClean['iPage'], $iPageRange, $iNumPages, - $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']); + $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']."&sLicense=". + $aClean['sLicense']); /* Selector for how many versions to display */ echo "<form method=\"get\" action=\"".$_SERVER['PHP_SELF']."\">\n";

1 0

appdb/admin editAppVersion.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31111 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:02:47 Modified files: admin : editAppVersion.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add text about downloadurl usage on version editing page Patch: http://cvs.winehq.org/patch.py?id=31111 Old revision New revision Changes Path 1.48 1.49 +4 -0 appdb/admin/editAppVersion.php Index: appdb/admin/editAppVersion.php diff -u -p appdb/admin/editAppVersion.php:1.48 appdb/admin/editAppVersion.php:1.49 --- appdb/admin/editAppVersion.php:1.48 27 Apr 2007 23: 2:47 -0000 +++ appdb/admin/editAppVersion.php 27 Apr 2007 23: 2:47 -0000 @@ -45,6 +45,10 @@ if(!empty($aClean['sSubmit'])) /* URL editor */ echo url::outputEditor("editAppVersion.php", $oVersion); + /* Display some text about download url usage */ + echo "A place where this version can be downloaded for free. Other downloads, "; + echo "such as updates, should be added in the regular URL form\n"; + /* Download URL editor */ echo downloadurl::outputEditor($oVersion, "editAppVersion.php");

1 0

lostwages/ include/winehq.conf news/2007042701.xml
by Alexandre Julliard 27 Apr '07

27 Apr '07

ChangeSet ID: 31110 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/04/27 10:08:52 Modified files: include : winehq.conf Added files: news : 2007042701.xml Log message: Release 0.9.36 Patch: http://cvs.winehq.org/patch.py?id=31110 Old revision New revision Changes Path 1.58 1.59 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007042701.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.58 lostwages/include/winehq.conf:1.59 --- lostwages/include/winehq.conf:1.58 27 Apr 2007 15: 8:52 -0000 +++ lostwages/include/winehq.conf 27 Apr 2007 15: 8:52 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.35 +snapshot_date: 0.9.36 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007042701.xml diff -u -p /dev/null lostwages/news/2007042701.xml:1.1 --- /dev/null 27 Apr 2007 15: 8:52 -0000 +++ lostwages/news/2007042701.xml 27 Apr 2007 15: 8:52 -0000 @@ -0,0 +1,26 @@ +<news> +<date>April 27, 2007</date> +<title>Wine 0.9.36 Released</title> +<body> +<p>Wine 0.9.36 was released today, with the following main changes:</p> + +<ul> +<li>Midi support in the CoreAudio driver.</li> +<li>Mixer support in the Alsa driver.</li> +<li>A lot of MSI fixes.</li> +<li>Implementation for most D3DRM functions.</li> +<li>The usual assortment of Direct3D fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.36.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.36">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.36.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 985283321a8902b278d026c6d6c7847657a4fcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=985283321a8902b278d026c6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 16:48:53 2007 +0200 Release 0.9.36. --- ANNOUNCE | 727 ++++++++++++++++++------------------ ChangeLog | 1230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1607 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=985283321a8902b278d02…

1 0

Tag wine-0.9.36 : Alexandre Julliard : Release 0.9.36
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: refs/tags/wine-0.9.36 Tag: 8c29427d76b0317e04f92a42907acf0bf9c79f54 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8c29427d76b0317e04f92a42907a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 16:48:53 2007 +0200 Release 0.9.36

1 0

Maarten Lankhorst : winealsa: Unset WAVECAPS_DIRECTSOUND properly for capture.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: b67164d248bebd3277e45c0550f0c5eff1f2ebc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67164d248bebd3277e45c055… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 24 20:12:07 2007 +0200 winealsa: Unset WAVECAPS_DIRECTSOUND properly for capture. --- dlls/winealsa.drv/waveinit.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 6614c00..11f8fdd 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -504,12 +504,6 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT; wwi.incaps.vDriverVersion = 0x0100; - if (wwi.ds_caps.dwFlags & WAVECAPS_DIRECTSOUND) - { - FIXME("Add support for DSCapture\n"); - wwi.ds_caps.dwFlags &= ~WAVECAPS_DIRECTSOUND; - } - rc = ALSA_ComputeCaps(ctl, pcm, &wwi.incaps.wChannels, &wwi.ds_caps.dwFlags, &wwi.incaps.dwFormats, &wwi.dwSupport); if (rc) @@ -519,6 +513,12 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm return(rc); } + if (wwi.dwSupport & WAVECAPS_DIRECTSOUND) + { + FIXME("Add support for DSCapture\n"); + wwi.dwSupport &= ~WAVECAPS_DIRECTSOUND; + } + rc = ALSA_AddDeviceToArray(&wwi, &WInDev, &ALSA_WidNumDevs, &ALSA_WidNumMallocedDevs, isdefault); if (rc) ALSA_FreeDevice(&wwi);

1 0

Kirill K. Smirnov : kernel32: Add partial stub for NeedCurrentDirectoryForExePath.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: fff6db62f389f4e6bf974b67926409b84d762faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff6db62f389f4e6bf974b679… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Apr 25 11:39:02 2007 +0400 kernel32: Add partial stub for NeedCurrentDirectoryForExePath. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 37 +++++++++++++++++++++++++++++++++++++ include/winbase.h | 3 +++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a675386..4d3d083 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -799,6 +799,8 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) @ stdcall MulDiv(long long long) @ stdcall MultiByteToWideChar(long long str long ptr long) +@ stdcall NeedCurrentDirectoryForExePathA(str) +@ stdcall NeedCurrentDirectoryForExePathW(wstr) # @ stub NlsConvertIntegerToString # @ stub NlsGetCacheUpdateCount # @ stub NlsResetProcessLocale diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b195435..eb752f0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1511,6 +1511,43 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) /*********************************************************************** + * NeedCurrentDirectoryForExePathW (KERNEL32.@) + */ +BOOL WINAPI NeedCurrentDirectoryForExePathW( LPCWSTR name ) +{ + static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t', + 'C','u','r','r','e','n','t', + 'D','i','r','e','c','t','o','r','y', + 'I','n','E','x','e','P','a','t','h',0}; + WCHAR env_val; + + /* MSDN mentions some 'registry location'. We do not use registry. */ + FIXME("(%s): partial stub\n", debugstr_w(name)); + + if (strchrW(name, '\\')) + return TRUE; + + /* Check the existence of the variable, not value */ + if (!GetEnvironmentVariableW( env_name, &env_val, 1 )) + return TRUE; + + return FALSE; +} + + +/*********************************************************************** + * NeedCurrentDirectoryForExePathA (KERNEL32.@) + */ +BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name ) +{ + WCHAR *nameW; + + if (!(nameW = FILE_name_AtoW( name, FALSE ))) return TRUE; + return NeedCurrentDirectoryForExePathW( nameW ); +} + + +/*********************************************************************** * wine_get_unix_file_name (KERNEL32.@) Not a Windows API * * Return the full Unix file name for a given path. diff --git a/include/winbase.h b/include/winbase.h index 59e7718..da9c547 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1839,6 +1839,9 @@ BOOL WINAPI MoveFileWithProgressA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID BOOL WINAPI MoveFileWithProgressW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); #define MoveFileWithProgress WINELIB_NAME_AW(MoveFileWithProgress) INT WINAPI MulDiv(INT,INT,INT); +BOOL WINAPI NeedCurrentDirectoryForExePathA(LPCSTR); +BOOL WINAPI NeedCurrentDirectoryForExePathW(LPCWSTR); +#define NeedCurrentDirectoryForExePath WINELIB_NAME_AW(NeedCurrentDirectoryForExePath) BOOL WINAPI NotifyChangeEventLog(HANDLE,HANDLE); BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR,LPVOID,BOOL); BOOL WINAPI ObjectCloseAuditAlarmW(LPCWSTR,LPVOID,BOOL);

1 0

Kirill K. Smirnov : kernel32/tests: Add tests for NeedCurrentDirectoryForExePath.
by Alexandre Julliard 27 Apr '07

27 Apr '07

Module: wine Branch: master Commit: 9eb0c8720459fa73da61600d4ed45e39f9aeff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb0c8720459fa73da61600d4… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Apr 25 11:41:11 2007 +0400 kernel32/tests: Add tests for NeedCurrentDirectoryForExePath. --- dlls/kernel32/tests/path.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 33fcf6f..47ec23f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -53,6 +53,10 @@ static const CHAR is_char_ok[] ="11111110111111111011"; static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR,LPSTR,DWORD); static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); +/* Present in Win2003+ */ +static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); +static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); + /* a structure to deal with wine todos somewhat cleanly */ typedef struct { DWORD shortlen; @@ -1074,6 +1078,44 @@ static void test_GetWindowsDirectory(void) res, GetLastError(), buffer, total); } +static void test_NeedCurrentDirectoryForExePathA(void) +{ + /* Crashes in Windows */ + if (0) + ok(pNeedCurrentDirectoryForExePathA(NULL), "returned FALSE for NULL\n"); + + SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", NULL); + ok(pNeedCurrentDirectoryForExePathA("."), "returned FALSE for \".\"\n"); + ok(pNeedCurrentDirectoryForExePathA("c:\\"), "returned FALSE for \"c:\\\"\n"); + ok(pNeedCurrentDirectoryForExePathA("cmd.exe"), "returned FALSE for \"cmd.exe\"\n"); + + SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", "nya"); + ok(!pNeedCurrentDirectoryForExePathA("."), "returned TRUE for \".\"\n"); + ok(pNeedCurrentDirectoryForExePathA("c:\\"), "returned FALSE for \"c:\\\"\n"); + ok(!pNeedCurrentDirectoryForExePathA("cmd.exe"), "returned TRUE for \"cmd.exe\"\n"); +} + +static void test_NeedCurrentDirectoryForExePathW(void) +{ + const WCHAR thispath[] = {'.', 0}; + const WCHAR fullpath[] = {'c', ':', '\\', 0}; + const WCHAR cmdname[] = {'c', 'm', 'd', '.', 'e', 'x', 'e', 0}; + + /* Crashes in Windows */ + if (0) + ok(pNeedCurrentDirectoryForExePathW(NULL), "returned FALSE for NULL\n"); + + SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", NULL); + ok(pNeedCurrentDirectoryForExePathW(thispath), "returned FALSE for \".\"\n"); + ok(pNeedCurrentDirectoryForExePathW(fullpath), "returned FALSE for \"c:\\\"\n"); + ok(pNeedCurrentDirectoryForExePathW(cmdname), "returned FALSE for \"cmd.exe\"\n"); + + SetEnvironmentVariableA("NoDefaultCurrentDirectoryInExePath", "nya"); + ok(!pNeedCurrentDirectoryForExePathW(thispath), "returned TRUE for \".\"\n"); + ok(pNeedCurrentDirectoryForExePathW(fullpath), "returned FALSE for \"c:\\\"\n"); + ok(!pNeedCurrentDirectoryForExePathW(cmdname), "returned TRUE for \"cmd.exe\"\n"); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -1081,6 +1123,13 @@ START_TEST(path) "GetLongPathNameA" ); pGetLongPathNameW = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll") , "GetLongPathNameW" ); + pNeedCurrentDirectoryForExePathA = + (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), + "NeedCurrentDirectoryForExePathA" ); + pNeedCurrentDirectoryForExePathW = + (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), + "NeedCurrentDirectoryForExePathW" ); + test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); test_PathNameA(curdir, curDrive, otherDrive); @@ -1089,4 +1138,12 @@ START_TEST(path) test_GetLongPathNameW(); test_GetSystemDirectory(); test_GetWindowsDirectory(); + if (pNeedCurrentDirectoryForExePathA) + { + test_NeedCurrentDirectoryForExePathA(); + } + if (pNeedCurrentDirectoryForExePathW) + { + test_NeedCurrentDirectoryForExePathW(); + } }

1 0