Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[dgoette] 408: * fix usage of UTF8 * show language selection also for unregistered users
by dgoette＠svn.reactos.org 07 May '09

07 May '09

Author: dgoette Date: Fri May 8 00:12:07 2009 New Revision: 408 URL: http://svn.reactos.org/svn/reactos?rev=408&view=rev Log: * fix usage of UTF8 * show language selection also for unregistered users Modified: branches/danny-web/www/www.reactos.org/roscms/connect.db.php branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… Modified: branches/danny-web/www/www.reactos.org/roscms/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/connect.db.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/connect.db.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -24,7 +24,7 @@ $db_user = 'username'; $db_pass = 'password'; $db_name = 'roscms'; -$db_port = 3301; +$db_port = 3306; // vars are unset in DBConnection class // !!! so be sure to use DBConnection or unset(..) yourself Modified: branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/DBConnection.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -53,6 +53,7 @@ // show errors as warning, and use our own statement class $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); $this->setAttribute(PDO::ATTR_STATEMENT_CLASS,array('DBStatement', array($this))); + $this->exec("SET names 'utf8'"); } catch (PDOException $e) { Modified: branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/HTML_User.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -89,7 +89,7 @@ echo_strip(' <h2>Account</h2> <ul> - <li title="'.htmlentities($thisuser->name()).'"> Nick: '.htmlentities($thisuser->name()).'</li> + <li title="'.htmlspecialchars($thisuser->name()).'"> Nick: '.htmlspecialchars($thisuser->name()).'</li> <li><a href="'.$config->pathInstance().'?page=my">My Profile</a></li> <li><a href="'.$config->pathInstance().'?page=search">User Search</a></li> <li><a href="'.$config->pathGenerated().'peoplemap/">User Map</a></li>'); @@ -128,38 +128,50 @@ <ul> <li> <div style="text-align:center;"> - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathInstance().'?'.htmlentities($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'"> - <optgroup label="current language">'); - - // print current language - $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang_id"); - $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); - $stmt->execute(); - $current_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); - - echo_strip(' - <option value="#">'.$current_lang['name'].'</option> - </optgroup> - <optgroup label="all languages">'); + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$config->pathInstance().'?'.htmlspecialchars($_SERVER['QUERY_STRING'])."&lang=' + this.options[this.selectedIndex].value".'">'); + + // show current profile language of registered users + if ($thisuser->language() > 0) { + // print current language + $stmt=&DBConnection::getInstance()->prepare("SELECT id, name FROM ".ROSCMST_LANGUAGES." WHERE id = :lang_id"); + $stmt->bindParam('lang_id',$thisuser->language(),PDO::PARAM_INT); + $stmt->execute(); + $current_lang = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + echo_strip(' + <optgroup label="current language"> + <option value="#">'.$current_lang['name'].'</option> + </optgroup> + <optgroup label="all languages">'); + + $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." WHERE id != :lang ORDER BY name ASC"); + $stmt->bindParam('lang',$current_lang['id'],PDO::PARAM_INT); + } + + // for guests show all + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." ORDER BY name ASC"); + } // print available languages - $stmt=&DBConnection::getInstance()->prepare("SELECT name, id, name_original FROM ".ROSCMST_LANGUAGES." WHERE id != :lang ORDER BY name ASC"); - $stmt->bindParam('lang',$current_lang['id'],PDO::PARAM_INT); $stmt->execute(); while ($language = $stmt->fetch(PDO::FETCH_ASSOC)) { // display original name in brackets, if a localized version is available if ($language['name_original'] != '') { - echo '<option value="'.$language['id'].'">'.$language['name'].' ('.htmlentities($language['name_original']).')</option>'; + echo '<option value="'.$language['id'].'">'.$language['name'].' ('.htmlspecialchars($language['name_original']).')</option>'; } else { echo '<option value="'.$language['id'].'">'.$language['name'].'</option>'; } } + + if ($thisuser->language() > 0) { + echo '</optgroup>'; + } // close navigation and open content area echo_strip(' - </optgroup> </select> </div> </li> Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_ACL.class.p… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -172,7 +172,7 @@ <tr id="tra'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editAccess(".$access['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$access['standard'].'</td> <td>'.$access['name'].'</td> - <td>'.htmlentities($access['description']).'</td> + <td>'.htmlspecialchars($access['description']).'</td> </tr>'); } Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Groups.clas… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -225,7 +225,7 @@ <tr id="trg'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editGroup(".$group['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$group['security_level'].'</td> <td>'.$group['name'].'</td> - <td>'.htmlentities($group['description']).'</td> + <td>'.htmlspecialchars($group['description']).'</td> </tr>'); } } // end of member function showSearch Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Admin_Languages.c… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -117,7 +117,7 @@ <tr id="trl'.($x).'" class="'.($x%2 ? 'odd' : 'even').'" onclick="'."editLanguage(".$lang['id'].")".'" onmouseover="'."hlRow(this.id,1)".'" onmouseout="'."hlRow(this.id,2)".'"> <td>'.$lang['name_short'].'</td> <td>'.$lang['name'].'</td> - <td>'.htmlentities($lang['name_original']).'</td> + <td>'.htmlspecialchars($lang['name_original']).'</td> </tr>'); } } // end of member function showSearch Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/EMail.class.php [iso-8859-1] Fri May 8 00:12:07 2009 @@ -55,7 +55,7 @@ } // email addresses - $receiver = htmlentities($receiver, ENT_NOQUOTES, 'UTF-8'); + $receiver = htmlspecialchars($receiver, ENT_NOQUOTES, 'UTF-8'); // header $headers = ""; Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -233,7 +233,7 @@ $target_clean = ''; if (isset($_REQUEST['target']) && preg_match('/^(\/[a-zA-Z0-9!$%&,\'()*+\-.\/:;=?@_~]+)$/', $_REQUEST['target'], $matches)) { - $target_clean = htmlentities($matches[1]); + $target_clean = htmlspecialchars($matches[1]); } echo_strip(' Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] Fri May 8 00:12:07 2009 @@ -86,7 +86,7 @@ <h2>Profile Search</h2> <div class="field"> <label for="search">Username</label> - <input name="search" type="text" id="search" value="'.@htmlentities($_GET['search']).'" /> + <input name="search" type="text" id="search" value="'.@htmlspecialchars($_GET['search']).'" /> </div> <div class="field"> <input type="hidden" name="page" id="page" value="search" />

1 0

[janderwald] 40829: - Load property sheet handlers also from * key - Fixes displaying custom file property handlers like for TortoiseSVN
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Thu May 7 22:21:53 2009 New Revision: 40829 URL: http://svn.reactos.org/svn/reactos?rev=40829&view=rev Log: - Load property sheet handlers also from * key - Fixes displaying custom file property handlers like for TortoiseSVN Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Thu May 7 22:21:53 2009 @@ -733,9 +733,12 @@ TRACE("EnumPropSheetExt szName %s\n", debugstr_w(szName)); hpsxa[0] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages, pDataObj); - hpsxa[1] = NULL; - Pages = SHAddFromPropSheetExtArray(hpsxa[0], AddShellPropSheetExCallback, (LPARAM)pinfo); + + hpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"*", NumPages-Pages, pDataObj); + Pages += SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); + + hpsxa[2] = NULL; if (pOffset) { @@ -746,8 +749,8 @@ { TRACE("EnumPropSheetExt szName %s, pOffset %s\n", debugstr_w(szName), debugstr_w(pOffset)); szName[(sizeof(szName) / sizeof(WCHAR)) - 1] = L'\0'; - hpsxa[1] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj); - Pages += SHAddFromPropSheetExtArray(hpsxa[1], AddShellPropSheetExCallback, (LPARAM)pinfo); + hpsxa[2] = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, szName, NumPages - Pages, pDataObj); + Pages += SHAddFromPropSheetExtArray(hpsxa[2], AddShellPropSheetExCallback, (LPARAM)pinfo); } } @@ -774,7 +777,7 @@ WCHAR wFileName[MAX_PATH]; DWORD dwHandle = 0; WCHAR *pFileName; - HPSXA hpsxa[2]; + HPSXA hpsxa[3]; INT_PTR res; IDataObject *pDataObj = NULL; HRESULT hResult; @@ -845,6 +848,7 @@ { hpsxa[0] = NULL; hpsxa[1] = NULL; + hpsxa[2] = NULL; } } @@ -865,6 +869,7 @@ { SHDestroyPropSheetExtArray(hpsxa[0]); SHDestroyPropSheetExtArray(hpsxa[1]); + SHDestroyPropSheetExtArray(hpsxa[2]); IDataObject_Release(pDataObj); }

1 0

[janderwald] 40828: - Pass IDataObject to the folder shell extension init function - Fixes displaying property sheet handler extension for directories such as TortoiseSVN
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Thu May 7 22:05:29 2009 New Revision: 40828 URL: http://svn.reactos.org/svn/reactos?rev=40828&view=rev Log: - Pass IDataObject to the folder shell extension init function - Fixes displaying property sheet handler extension for directories such as TortoiseSVN Modified: trunk/reactos/dll/win32/shell32/folder_options.c trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Thu May 7 22:05:29 2009 @@ -83,6 +83,7 @@ }; */ +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); INT_PTR CALLBACK @@ -562,15 +563,16 @@ } BOOL -SH_ShowFolderProperties(LPWSTR pwszFolder) +SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl) { HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; HPROPSHEETPAGE hpage; PROPSHEETHEADERW psh; BOOL ret; WCHAR szName[MAX_PATH] = {0}; - HPSXA hpsx; + HPSXA hpsx = NULL; LPWSTR pFolderName; + IDataObject * pDataObj = NULL; if (!PathIsDirectoryW(pwszFolder)) return FALSE; @@ -594,15 +596,25 @@ psh.u3.phpage = hppages; psh.pszCaption = szName; - hpsx = SHCreatePropSheetExtArray(HKEY_CLASSES_ROOT, - L"Directory", - MAX_PROPERTY_SHEET_PAGE-1); - - SHAddFromPropSheetExtArray(hpsx, - (LPFNADDPROPSHEETPAGE)FolderAddPropSheetPageProc, - (LPARAM)&psh); + + if (SHCreateDataObject(pidlFolder, 1, apidl, NULL, &IID_IDataObject, (void**)&pDataObj) == S_OK) + { + hpsx = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, L"Directory", MAX_PROPERTY_SHEET_PAGE-1, pDataObj); + if (hpsx) + { + SHAddFromPropSheetExtArray(hpsx, + (LPFNADDPROPSHEETPAGE)FolderAddPropSheetPageProc, + (LPARAM)&psh); + } + } ret = PropertySheetW(&psh); + if (pDataObj) + IDataObject_Release(pDataObj); + + if (hpsx) + SHDestroyPropSheetExtArray(hpsx); + if (ret < 0) return FALSE; else Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Thu May 7 22:05:29 2009 @@ -807,7 +807,7 @@ if (PathIsDirectoryW(wFileName)) { - return SH_ShowFolderProperties(wFileName); + return SH_ShowFolderProperties(wFileName, pidlFolder, apidl); } if (wcslen(wFileName) == 3) Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Thu May 7 22:05:29 2009 @@ -235,5 +235,5 @@ BOOL SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); -BOOL SH_ShowFolderProperties(LPWSTR pwszFolder); +BOOL SH_ShowFolderProperties(LPWSTR pwszFolder, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); #endif

1 0

[janderwald] 40827: - PropertySheetHandlers for directories are registered under Directory key
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Thu May 7 21:39:49 2009 New Revision: 40827 URL: http://svn.reactos.org/svn/reactos?rev=40827&view=rev Log: - PropertySheetHandlers for directories are registered under Directory key Modified: trunk/reactos/dll/win32/shell32/folder_options.c Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Thu May 7 21:39:49 2009 @@ -595,7 +595,7 @@ psh.pszCaption = szName; hpsx = SHCreatePropSheetExtArray(HKEY_CLASSES_ROOT, - L"Folder", + L"Directory", MAX_PROPERTY_SHEET_PAGE-1); SHAddFromPropSheetExtArray(hpsx,

1 0

[dgorbachev] 40826: - Add / update Romanian translations, Petru Dimitriu, bug #4452. - Update Norwegian translations, L. M. Hambro, bug #4477. - Silence warnings in shell32 translations, bug #4090.
by dgorbachev＠svn.reactos.org 07 May '09

07 May '09

Author: dgorbachev Date: Thu May 7 20:49:31 2009 New Revision: 40826 URL: http://svn.reactos.org/svn/reactos?rev=40826&view=rev Log: - Add / update Romanian translations, Petru Dimitriu, bug #4452. - Update Norwegian translations, L. M. Hambro, bug #4477. - Silence warnings in shell32 translations, bug #4090. Added: trunk/reactos/dll/cpl/console/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/input/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/intl/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc (with props) trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/dll/cpl/console/lang/en-US.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US… Added: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Added: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=4… Added: trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ro-R… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Added: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no…

1 0

[janderwald] 40823: - Use a spinlock with list functions over interlocked list functions - Use a bitmap for storing reference count of the mappings as mapping are complete async and not very likely in determined order
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Thu May 7 02:58:57 2009 New Revision: 40823 URL: http://svn.reactos.org/svn/reactos?rev=40823&view=rev Log: - Use a spinlock with list functions over interlocked list functions - Use a bitmap for storing reference count of the mappings as mapping are complete async and not very likely in determined order Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Thu May 7 02:58:57 2009 @@ -14,6 +14,7 @@ KSSTREAM_HEADER *Header; PIRP Irp; + ULONG References; ULONG NumTags; PVOID * Tag; }IRP_MAPPING, *PIRP_MAPPING; @@ -141,6 +142,7 @@ IN PIRP Irp) { PIRP_MAPPING Mapping; + ULONG Index; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); @@ -166,7 +168,6 @@ { Mapping->NumTags++; } - ASSERT(Mapping->NumTags < 32); } } else @@ -181,12 +182,18 @@ FreeItem(Mapping, TAG_PORTCLASS); return STATUS_UNSUCCESSFUL; } + ASSERT(Mapping->NumTags < 32); + for(Index = 0; Index < Mapping->NumTags; Index++); + Mapping->References |= (1 << Index); This->NumDataAvailable += Mapping->Header->DataUsed; - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p NumTags %u FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->NumTags, This->MaxFrameSize); - - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p NumTags %u References %x FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->NumTags, Mapping->References, This->MaxFrameSize); + + KeAcquireSpinLockAtDpcLevel(&This->Lock); + InsertTailList(&This->ListHead, &Mapping->Entry); + KeReleaseSpinLockFromDpcLevel(&This->Lock); + (void)InterlockedIncrement((volatile long*)&This->NumMappings); if (Irp) @@ -253,7 +260,10 @@ { This->CurrentOffset = 0; - (void)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + KeAcquireSpinLockAtDpcLevel(&This->Lock); + RemoveHeadList(&This->ListHead); + KeReleaseSpinLockFromDpcLevel(&This->Lock); + InterlockedDecrement(&This->NumMappings); FreeMappingRoutine(CurMapping); } @@ -339,7 +349,7 @@ /* calculate the offset */ if (Index) - Offset = (Index + 1) * This->MaxFrameSize; + Offset = Index * This->MaxFrameSize; else Offset = 0; @@ -416,6 +426,7 @@ KeReleaseSpinLockFromDpcLevel(&This->Lock); This->OutOfMapping = TRUE; This->StartStream = FALSE; + DPRINT("No Mapping available\n"); return STATUS_UNSUCCESSFUL; } @@ -425,9 +436,9 @@ IN IIrpQueue *iface, IN PVOID Tag) { - PIRP_MAPPING CurMapping; + PIRP_MAPPING CurMapping = NULL; PLIST_ENTRY CurEntry; - ULONG Index; + ULONG Index = 0; ULONG Found; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; @@ -440,40 +451,48 @@ return STATUS_UNSUCCESSFUL; } - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); Found = FALSE; - - for(Index = 0; Index < CurMapping->NumTags; Index++) - { - if (CurMapping->Tag[Index] == Tag) + MapIndex = 0; + while (CurEntry != &This->ListHead) + { + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + for(Index = 0; Index < CurMapping->NumTags; Index++) { - Found = TRUE; + if (CurMapping->Tag[Index] == Tag) + { + Found = TRUE; + break; + } + } + if (Found) break; - } - } - KeReleaseSpinLockFromDpcLevel(&This->Lock); + + CurEntry = CurEntry->Flink; + } if (!Found) { - DPRINT("Tag %p not in first mapping %p\n", Tag, CurMapping); - return STATUS_UNSUCCESSFUL; - } - - if (Index != CurMapping->NumTags - 1) + DPRINT1("Tag %p not found\n", Tag); + ASSERT(Found); + } + DPRINT("References %x\n", CurMapping->References); + CurMapping->References &= ~(1 << Index); + + if (CurMapping->References) { /* released mapping is not the last mapping of the irp */ - DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags %u\n", Tag, Index, CurMapping->NumTags); + DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags %u Refs %x\n", Tag, Index, CurMapping->NumTags, CurMapping->References); + KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - ASSERT(CurEntry); - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + RemoveEntryList(&CurMapping->Entry); /* last mapping of the irp, free irp */ DPRINT("Freeing mapping %p\n", CurMapping); InterlockedDecrement(&This->NumMappings); FreeMappingRoutine(CurMapping); + KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Thu May 7 02:58:57 2009 @@ -636,6 +636,7 @@ if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) { /* notify port driver that new mapping is available */ + DPRINT("Notifying of new mapping\n"); This->Stream->lpVtbl->MappingAvailable(This->Stream); }

2 1

[janderwald] 40825: - Fix build (sorry)
by janderwald＠svn.reactos.org 07 May '09

07 May '09

Author: janderwald Date: Thu May 7 12:11:02 2009 New Revision: 40825 URL: http://svn.reactos.org/svn/reactos?rev=40825&view=rev Log: - Fix build (sorry) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Thu May 7 12:11:02 2009 @@ -452,7 +452,6 @@ } Found = FALSE; - MapIndex = 0; while (CurEntry != &This->ListHead) { CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry);

1 0

[jimtabor] 40824: - This helps gimp 2.4.6 start-up. But there is another bug in msvcrt.dll that throws an exception. I must apologize for not doing this sooner.
by jimtabor＠svn.reactos.org 07 May '09

07 May '09

Author: jimtabor Date: Thu May 7 09:49:35 2009 New Revision: 40824 URL: http://svn.reactos.org/svn/reactos?rev=40824&view=rev Log: - This helps gimp 2.4.6 start-up. But there is another bug in msvcrt.dll that throws an exception. I must apologize for not doing this sooner. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu May 7 09:49:35 2009 @@ -283,7 +283,7 @@ if (Win32Thread->ThreadInfo) { Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0; - Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; +// Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; } } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu May 7 09:49:35 2009 @@ -547,7 +547,8 @@ sizeof(ULONG)); // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); - ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! +// ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! + ci->pClientThreadInfo = NULL; ci->ppi = ti->ppi; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

1 0

[janderwald] 40822: - Only call ReleaseStgMedium when IDataObject_GetData has succeeded - Fixes explorer crashing on context menu click
by janderwald＠svn.reactos.org 06 May '09

06 May '09

Author: janderwald Date: Thu May 7 02:07:53 2009 New Revision: 40822 URL: http://svn.reactos.org/svn/reactos?rev=40822&view=rev Log: - Only call ReleaseStgMedium when IDataObject_GetData has succeeded - Fixes explorer crashing on context menu click Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu May 7 02:07:53 2009 @@ -299,10 +299,10 @@ if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) { ret = TRUE; + ReleaseStgMedium(&medium); } IDataObject_Release(pda); - ReleaseStgMedium(&medium); } return ret;

1 0

[janderwald] 40821: - Fix debug statement - Modify reference handling for irp mappings
by janderwald＠svn.reactos.org 06 May '09

06 May '09

Author: janderwald Date: Wed May 6 23:25:33 2009 New Revision: 40821 URL: http://svn.reactos.org/svn/reactos?rev=40821&view=rev Log: - Fix debug statement - Modify reference handling for irp mappings Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Wed May 6 23:25:33 2009 @@ -16,8 +16,6 @@ ULONG NumTags; PVOID * Tag; - LONG ReferenceCount; - }IRP_MAPPING, *PIRP_MAPPING; typedef struct @@ -36,7 +34,6 @@ KSPIN_LOCK Lock; LIST_ENTRY ListHead; - PVOID LastTag; ULONG OutOfMapping; ULONG MaxFrameSize; @@ -128,7 +125,6 @@ This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; - This->LastTag = NULL; InitializeListHead(&This->ListHead); KeInitializeSpinLock(&This->Lock); @@ -146,7 +142,6 @@ { PIRP_MAPPING Mapping; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); if (!Mapping) @@ -171,14 +166,25 @@ { Mapping->NumTags++; } + ASSERT(Mapping->NumTags < 32); } - Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); - Mapping->ReferenceCount = Mapping->NumTags; + } + else + { + /* no framesize restriction */ + Mapping->NumTags = 1; + } + + Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); + if (!Mapping->Tag) + { + FreeItem(Mapping, TAG_PORTCLASS); + return STATUS_UNSUCCESSFUL; } This->NumDataAvailable += Mapping->Header->DataUsed; - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p ReferenceCount %u FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->ReferenceCount, This->MaxFrameSize); + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p NumTags %u FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->NumTags, This->MaxFrameSize); ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); (void)InterlockedIncrement((volatile long*)&This->NumMappings); @@ -331,9 +337,6 @@ { ULONG Offset; - /* store the tag */ - This->LastTag = Tag; - /* calculate the offset */ if (Index) Offset = (Index + 1) * This->MaxFrameSize; @@ -353,21 +356,16 @@ /* decrement available byte counter */ This->NumDataAvailable -= *ByteCount; - /* store the tag */ - if (Index) - CurMapping->Tag[Index+1] = Tag; - else - CurMapping->Tag[Index] = Tag; - - if (Index + 1 == CurMapping->NumTags - 1) + CurMapping->Tag[Index] = Tag; + + if (Index + 1 == CurMapping->NumTags) { /* indicate end of packet */ *Flags = 1; } - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p NumTags %u ReferenceCount %u\n", Tag, CurMapping, CurMapping->NumTags, CurMapping->ReferenceCount); - + DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p Index %u NumTags %u\n", Tag, CurMapping, Index, CurMapping->NumTags); } @@ -387,7 +385,7 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; - ASSERT(This->MaxFrameSize); + ASSERT(Tag != NULL); KeAcquireSpinLockAtDpcLevel(&This->Lock); @@ -405,39 +403,10 @@ CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); for(Index = 0; Index < CurMapping->NumTags; Index++) { - /* first stream mapping */ - if (This->LastTag == NULL) + if (CurMapping->Tag[Index] == NULL) { - ASSERT(Index == 0); + /* found a free mapping within audio irp */ GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; - } - - if (CurMapping->Tag[Index] == This->LastTag) - { - ASSERT(Index); - if (Index + 1 < CurMapping->NumTags) - { - /* found a free mapping within audio irp */ - GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; - } - - /* last tag was at at last mapping, iterate to next audio irp */ - CurEntry = CurEntry->Flink; - if (&This->ListHead == CurEntry) - { - /* no more items available */ - This->OutOfMapping = TRUE; - This->StartStream = FALSE; - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_UNSUCCESSFUL; - } - - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - GetMapping(This, 0, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } @@ -462,15 +431,12 @@ ULONG Found; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - ASSERT(This->MaxFrameSize); - - DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag); - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - - if (!CurEntry) - { - DPRINT("Empty List while releasing mapping!\n"); + KeAcquireSpinLockAtDpcLevel(&This->Lock); + + CurEntry = This->ListHead.Flink; + if (CurEntry == &This->ListHead) + { + KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_UNSUCCESSFUL; } @@ -481,31 +447,33 @@ { if (CurMapping->Tag[Index] == Tag) { - CurMapping->Tag[Index] = NULL; - InterlockedDecrement((PLONG)&CurMapping->ReferenceCount); Found = TRUE; break; } } + KeReleaseSpinLockFromDpcLevel(&This->Lock); if (!Found) { DPRINT("Tag %p not in first mapping %p\n", Tag, CurMapping); - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); return STATUS_UNSUCCESSFUL; } - if (!CurMapping->ReferenceCount) - { - DPRINT("Freeing mapping %p\n", CurMapping); - InterlockedDecrement(&This->NumMappings); - FreeMappingRoutine(CurMapping); - } - else - { - /* insert item back into list as it still has references */ - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); - } + if (Index != CurMapping->NumTags - 1) + { + /* released mapping is not the last mapping of the irp */ + DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags %u\n", Tag, Index, CurMapping->NumTags); + return STATUS_SUCCESS; + } + + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + ASSERT(CurEntry); + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + + /* last mapping of the irp, free irp */ + DPRINT("Freeing mapping %p\n", CurMapping); + InterlockedDecrement(&This->NumMappings); + FreeMappingRoutine(CurMapping); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed May 6 23:25:33 2009 @@ -1051,10 +1051,8 @@ DPRINT1("Failed to add pin to service group\n"); return Status; } - //This->ServiceGroup->lpVtbl->AddRef(This->ServiceGroup); + This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); - //This->DmaChannel->lpVtbl->AddRef(This->DmaChannel); - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); This->State = KSSTATE_STOP; This->CommonBufferOffset = 0; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Wed May 6 23:25:33 2009 @@ -202,7 +202,7 @@ ASSERT_IRQL(DISPATCH_LEVEL); Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT("Position %llu Status %x\n", Position, Status); + DPRINT("Position %lu Status %x\n", Position, Status); } static IServiceSinkVtbl vt_IServiceSink =

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009