Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 54380: [SHELL32] - Rename CBitBucket to CRecycleBin
by rharabien＠svn.reactos.org 14 Nov '11

14 Nov '11

Author: rharabien Date: Mon Nov 14 22:46:37 2011 New Revision: 54380 URL: http://svn.reactos.org/svn/reactos?rev=54380&view=rev Log: [SHELL32] - Rename CBitBucket to CRecycleBin Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Mon Nov 14 22:46:37 2011 @@ -1284,7 +1284,7 @@ OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder) OBJECT_ENTRY(CLSID_Printers, CPrinterFolder) OBJECT_ENTRY(CLSID_AdminFolderShortcut, CAdminToolsFolder) -OBJECT_ENTRY(CLSID_RecycleBin, CBitBucket) +OBJECT_ENTRY(CLSID_RecycleBin, CRecycleBin) OBJECT_ENTRY(CLSID_OpenWithMenu, COpenWithMenu) OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) OBJECT_ENTRY(CLSID_StartMenu, CStartMenuCallback) Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp [iso-8859-1] Mon Nov 14 22:46:37 2011 @@ -23,7 +23,7 @@ #include <precomp.h> -WINE_DEFAULT_DEBUG_CHANNEL(CBitBucket); +WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin); typedef struct { @@ -35,7 +35,7 @@ int cxChars; } columninfo; -static const columninfo CBitBucketColumns[] = +static const columninfo RecycleBinColumns[] = { {IDS_SHV_COLUMN1, &FMTID_Storage, PID_STG_NAME, SHCOLSTATE_TYPE_STR|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, {IDS_SHV_COLUMN_DELFROM, &FMTID_Displaced, PID_DISPLACED_FROM, SHCOLSTATE_TYPE_STR|SHCOLSTATE_ONBYDEFAULT, LVCFMT_LEFT, 30}, @@ -60,31 +60,31 @@ * Recycle Bin folder */ -class CBitBucketEnum : +class CRecycleBinEnum : public IEnumIDListImpl { private: public: - CBitBucketEnum(); - ~CBitBucketEnum(); + CRecycleBinEnum(); + ~CRecycleBinEnum(); HRESULT WINAPI Initialize(DWORD dwFlags); - static BOOL WINAPI CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile); - BOOL WINAPI CBEnumBitBucket(IN HANDLE hDeletedFile); - -BEGIN_COM_MAP(CBitBucketEnum) + static BOOL WINAPI CBEnumRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile); + BOOL WINAPI CBEnumRecycleBin(IN HANDLE hDeletedFile); + +BEGIN_COM_MAP(CRecycleBinEnum) COM_INTERFACE_ENTRY_IID(IID_IEnumIDList, IEnumIDList) END_COM_MAP() }; -class CCBitBucketItemContextMenu : +class CRecycleBinItemContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IContextMenu2 { private: LPITEMIDLIST apidl; public: - CCBitBucketItemContextMenu(); - ~CCBitBucketItemContextMenu(); + CRecycleBinItemContextMenu(); + ~CRecycleBinItemContextMenu(); HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); // IContextMenu @@ -95,7 +95,7 @@ // IContextMenu2 virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); -BEGIN_COM_MAP(CCBitBucketItemContextMenu) +BEGIN_COM_MAP(CRecycleBinItemContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) END_COM_MAP() @@ -115,7 +115,7 @@ DWORD dwMaxCapacity; }DRIVE_ITEM_CONTEXT, *PDRIVE_ITEM_CONTEXT; -BOOL WINAPI CBSearchBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) +BOOL WINAPI CBSearchRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) { PSEARCH_CONTEXT pContext = (PSEARCH_CONTEXT)Context; @@ -173,15 +173,15 @@ return NULL; } -CBitBucketEnum::CBitBucketEnum() -{ -} - -CBitBucketEnum::~CBitBucketEnum() -{ -} - -HRESULT WINAPI CBitBucketEnum::Initialize(DWORD dwFlags) +CRecycleBinEnum::CRecycleBinEnum() +{ +} + +CRecycleBinEnum::~CRecycleBinEnum() +{ +} + +HRESULT WINAPI CRecycleBinEnum::Initialize(DWORD dwFlags) { static LPCWSTR szDrive = L"C:\\"; @@ -189,9 +189,9 @@ { TRACE("Starting Enumeration\n"); - if (!EnumerateRecycleBinW(szDrive /* FIXME */ , CBEnumBitBucket, (PVOID)this)) + if (!EnumerateRecycleBinW(szDrive /* FIXME */ , CBEnumRecycleBin, (PVOID)this)) { - WARN("Error: EnumerateCBitBucketW failed\n"); + WARN("Error: EnumerateCRecycleBinW failed\n"); return E_FAIL; } } @@ -227,12 +227,12 @@ return pidl; } -BOOL WINAPI CBitBucketEnum::CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) -{ - return ((CBitBucketEnum *)Context)->CBEnumBitBucket(hDeletedFile); -} - -BOOL WINAPI CBitBucketEnum::CBEnumBitBucket(IN HANDLE hDeletedFile) +BOOL WINAPI CRecycleBinEnum::CBEnumRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) +{ + return ((CRecycleBinEnum *)Context)->CBEnumRecycleBin(hDeletedFile); +} + +BOOL WINAPI CRecycleBinEnum::CBEnumRecycleBin(IN HANDLE hDeletedFile) { PDELETED_FILE_DETAILS_W pFileDetails; DWORD dwSize; @@ -287,17 +287,17 @@ * IContextMenu2 Bitbucket Item Implementation */ -CCBitBucketItemContextMenu::CCBitBucketItemContextMenu() +CRecycleBinItemContextMenu::CRecycleBinItemContextMenu() { apidl = NULL; } -CCBitBucketItemContextMenu::~CCBitBucketItemContextMenu() +CRecycleBinItemContextMenu::~CRecycleBinItemContextMenu() { ILFree(apidl); } -HRESULT WINAPI CCBitBucketItemContextMenu::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CRecycleBinItemContextMenu::Initialize(LPCITEMIDLIST pidl) { apidl = ILClone(pidl); if (apidl == NULL) @@ -305,7 +305,7 @@ return S_OK; } -HRESULT WINAPI CCBitBucketItemContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +HRESULT WINAPI CRecycleBinItemContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { WCHAR szBuffer[30] = {0}; ULONG Count = 1; @@ -343,7 +343,7 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); } -HRESULT WINAPI CCBitBucketItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT WINAPI CRecycleBinItemContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { SEARCH_CONTEXT Context; static LPCWSTR szDrive = L"C:\\"; @@ -355,7 +355,7 @@ Context.pFileDetails = _ILGetRecycleStruct(apidl); Context.bFound = FALSE; - EnumerateRecycleBinW(szDrive, CBSearchBitBucket, (PVOID)&Context); + EnumerateRecycleBinW(szDrive, CBSearchRecycleBin, (PVOID)&Context); if (!Context.bFound) return E_FAIL; @@ -387,23 +387,23 @@ return S_OK; } -HRESULT WINAPI CCBitBucketItemContextMenu::GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) +HRESULT WINAPI CRecycleBinItemContextMenu::GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) { TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); return E_FAIL; } -HRESULT WINAPI CCBitBucketItemContextMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TRACE("CBitBucket_IContextMenu2Item_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",this, uMsg, wParam, lParam); +HRESULT WINAPI CRecycleBinItemContextMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + TRACE("CRecycleBin_IContextMenu2Item_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",this, uMsg, wParam, lParam); return E_NOTIMPL; } -static HRESULT WINAPI CBitBucketItemContextMenuConstructor(REFIID riid, LPCITEMIDLIST pidl, LPVOID *ppv) -{ - CComObject<CCBitBucketItemContextMenu> *theMenu; +static HRESULT WINAPI CRecycleBinItemContextMenuConstructor(REFIID riid, LPCITEMIDLIST pidl, LPVOID *ppv) +{ + CComObject<CRecycleBinItemContextMenu> *theMenu; CComPtr<IUnknown> result; HRESULT hResult; @@ -412,7 +412,7 @@ if (ppv == NULL) return E_POINTER; *ppv = NULL; - ATLTRY(theMenu = new CComObject<CCBitBucketItemContextMenu>); + ATLTRY(theMenu = new CComObject<CRecycleBinItemContextMenu>); if (theMenu == NULL) return E_OUTOFMEMORY; hResult = theMenu->QueryInterface(riid, (void **)&result); @@ -429,23 +429,23 @@ return S_OK; } -CBitBucket::CBitBucket() +CRecycleBin::CRecycleBin() { pidl = NULL; iIdEmpty = 0; } -CBitBucket::~CBitBucket() +CRecycleBin::~CRecycleBin() { /* InterlockedDecrement(&objCount);*/ SHFree(pidl); } /************************************************************************* - * BitBucket IPersistFolder2 interface + * RecycleBin IPersistFolder2 interface */ -HRESULT WINAPI CBitBucket::GetClassID(CLSID *pClassID) +HRESULT WINAPI CRecycleBin::GetClassID(CLSID *pClassID) { TRACE("(%p, %p)\n", this, pClassID); if (pClassID == NULL) @@ -454,7 +454,7 @@ return S_OK; } -HRESULT WINAPI CBitBucket::Initialize(LPCITEMIDLIST pidl) +HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidl) { TRACE("(%p, %p)\n", this, pidl); @@ -465,7 +465,7 @@ return S_OK; } -HRESULT WINAPI CBitBucket::GetCurFolder(LPITEMIDLIST *ppidl) +HRESULT WINAPI CRecycleBin::GetCurFolder(LPITEMIDLIST *ppidl) { TRACE("\n"); *ppidl = ILClone(pidl); @@ -473,10 +473,10 @@ } /************************************************************************* - * BitBucket IShellFolder2 interface + * RecycleBin IShellFolder2 interface */ -HRESULT WINAPI CBitBucket::ParseDisplayName(HWND hwnd, LPBC pbc, +HRESULT WINAPI CRecycleBin::ParseDisplayName(HWND hwnd, LPBC pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, LPITEMIDLIST *ppidl, ULONG *pdwAttributes) { @@ -491,9 +491,9 @@ return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID; } -HRESULT WINAPI CBitBucket::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) -{ - CComObject<CBitBucketEnum> *theEnumerator; +HRESULT WINAPI CRecycleBin::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) +{ + CComObject<CRecycleBinEnum> *theEnumerator; CComPtr<IEnumIDList> result; HRESULT hResult; @@ -502,7 +502,7 @@ if (ppEnumIDList == NULL) return E_POINTER; *ppEnumIDList = NULL; - ATLTRY (theEnumerator = new CComObject<CBitBucketEnum>); + ATLTRY (theEnumerator = new CComObject<CRecycleBinEnum>); if (theEnumerator == NULL) return E_OUTOFMEMORY; hResult = theEnumerator->QueryInterface(IID_IEnumIDList, (void **)&result); @@ -521,19 +521,19 @@ return S_OK; } -HRESULT WINAPI CBitBucket::BindToObject(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +HRESULT WINAPI CRecycleBin::BindToObject(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) { FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); return E_NOTIMPL; } -HRESULT WINAPI CBitBucket::BindToStorage(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) +HRESULT WINAPI CRecycleBin::BindToStorage(LPCITEMIDLIST pidl, LPBC pbc, REFIID riid, void **ppv) { FIXME("(%p, %p, %p, %s, %p) - stub\n", this, pidl, pbc, debugstr_guid(&riid), ppv); return E_NOTIMPL; } -HRESULT WINAPI CBitBucket::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +HRESULT WINAPI CRecycleBin::CompareIDs(LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { /* TODO */ TRACE("(%p, %p, %p, %p)\n", this, (void *)lParam, pidl1, pidl2); @@ -542,7 +542,7 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (unsigned short)memcmp(pidl1->mkid.abID, pidl2->mkid.abID, pidl1->mkid.cb)); } -HRESULT WINAPI CBitBucket::CreateViewObject(HWND hwndOwner, REFIID riid, void **ppv) +HRESULT WINAPI CRecycleBin::CreateViewObject(HWND hwndOwner, REFIID riid, void **ppv) { LPSHELLVIEW pShellView; HRESULT hr = E_NOINTERFACE; @@ -579,7 +579,7 @@ } -HRESULT WINAPI CBitBucket::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CRecycleBin::GetAttributesOf(UINT cidl, LPCITEMIDLIST *apidl, SFGAOF *rgfInOut) { TRACE("(%p, %d, {%p, ...}, {%x})\n", this, cidl, apidl ? apidl[0] : NULL, (unsigned int)*rgfInOut); @@ -587,7 +587,7 @@ return S_OK; } -HRESULT WINAPI CBitBucket::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, +HRESULT WINAPI CRecycleBin::GetUIObjectOf(HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, REFIID riid, UINT *prgfInOut, void **ppv) { IUnknown *pObj = NULL; @@ -603,7 +603,7 @@ if ((IsEqualIID (riid, IID_IContextMenu) || IsEqualIID(riid, IID_IContextMenu2)) && (cidl >= 1)) { - hr = CBitBucketItemContextMenuConstructor(riid, apidl[0], (void **)&pObj); + hr = CRecycleBinItemContextMenuConstructor(riid, apidl[0], (void **)&pObj); } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { @@ -620,7 +620,7 @@ return hr; } -HRESULT WINAPI CBitBucket::GetDisplayNameOf(LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) +HRESULT WINAPI CRecycleBin::GetDisplayNameOf(LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) { PIDLRecycleStruct *pFileDetails; LPWSTR pFileName; @@ -664,27 +664,27 @@ return S_OK; } -HRESULT WINAPI CBitBucket::SetNameOf(HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, +HRESULT WINAPI CRecycleBin::SetNameOf(HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, SHGDNF uFlags, LPITEMIDLIST *ppidlOut) { TRACE("\n"); return E_FAIL; /* not supported */ } -HRESULT WINAPI CBitBucket::GetDefaultSearchGUID(GUID *pguid) +HRESULT WINAPI CRecycleBin::GetDefaultSearchGUID(GUID *pguid) { FIXME("stub\n"); return E_NOTIMPL; } -HRESULT WINAPI CBitBucket::EnumSearches(IEnumExtraSearch **ppEnum) +HRESULT WINAPI CRecycleBin::EnumSearches(IEnumExtraSearch **ppEnum) { FIXME("stub\n"); *ppEnum = NULL; return E_NOTIMPL; } -HRESULT WINAPI CBitBucket::GetDefaultColumn(DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) +HRESULT WINAPI CRecycleBin::GetDefaultColumn(DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) { TRACE("(%p, %x, %p, %p)\n", this, (unsigned int)dwReserved, pSort, pDisplay); *pSort = 0; @@ -692,16 +692,16 @@ return S_OK; } -HRESULT WINAPI CBitBucket::GetDefaultColumnState(UINT iColumn, SHCOLSTATEF *pcsFlags) +HRESULT WINAPI CRecycleBin::GetDefaultColumnState(UINT iColumn, SHCOLSTATEF *pcsFlags) { TRACE("(%p, %d, %p)\n", this, iColumn, pcsFlags); if (iColumn >= COLUMNS_COUNT) return E_INVALIDARG; - *pcsFlags = CBitBucketColumns[iColumn].pcsFlags; - return S_OK; -} - -HRESULT WINAPI CBitBucket::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) + *pcsFlags = RecycleBinColumns[iColumn].pcsFlags; + return S_OK; +} + +HRESULT WINAPI CRecycleBin::GetDetailsEx(LPCITEMIDLIST pidl, const SHCOLUMNID *pscid, VARIANT *pv) { FIXME("stub\n"); return E_NOTIMPL; @@ -727,7 +727,7 @@ return (ret!=0 ? E_FAIL : S_OK); } -HRESULT WINAPI CBitBucket::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) +HRESULT WINAPI CRecycleBin::GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { PIDLRecycleStruct * pFileDetails; WCHAR buffer[MAX_PATH]; @@ -738,12 +738,12 @@ TRACE("(%p, %p, %d, %p)\n", this, pidl, iColumn, pDetails); if (iColumn >= COLUMNS_COUNT) return E_FAIL; - pDetails->fmt = CBitBucketColumns[iColumn].fmt; - pDetails->cxChar = CBitBucketColumns[iColumn].cxChars; + pDetails->fmt = RecycleBinColumns[iColumn].fmt; + pDetails->cxChar = RecycleBinColumns[iColumn].cxChars; if (pidl == NULL) { pDetails->str.uType = STRRET_WSTR; - LoadStringW(shell32_hInstance, CBitBucketColumns[iColumn].column_name_id, buffer, MAX_PATH); + LoadStringW(shell32_hInstance, RecycleBinColumns[iColumn].column_name_id, buffer, MAX_PATH); return SHStrDupW(buffer, &pDetails->str.pOleStr); } @@ -791,21 +791,21 @@ return SHStrDupW(buffer, &pDetails->str.pOleStr); } -HRESULT WINAPI CBitBucket::MapColumnToSCID(UINT iColumn, SHCOLUMNID *pscid) +HRESULT WINAPI CRecycleBin::MapColumnToSCID(UINT iColumn, SHCOLUMNID *pscid) { TRACE("(%p, %d, %p)\n", this, iColumn, pscid); if (iColumn>=COLUMNS_COUNT) return E_INVALIDARG; - pscid->fmtid = *CBitBucketColumns[iColumn].fmtId; - pscid->pid = CBitBucketColumns[iColumn].pid; + pscid->fmtid = *RecycleBinColumns[iColumn].fmtId; + pscid->pid = RecycleBinColumns[iColumn].pid; return S_OK; } /************************************************************************* - * BitBucket IContextMenu interface + * RecycleBin IContextMenu interface */ -HRESULT WINAPI CBitBucket::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +HRESULT WINAPI CRecycleBin::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { WCHAR szBuffer[100]; MENUITEMINFOW mii; @@ -835,7 +835,7 @@ return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); } -HRESULT WINAPI CBitBucket::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) +HRESULT WINAPI CRecycleBin::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) { HRESULT hr; LPSHELLBROWSER lpSB; @@ -859,7 +859,7 @@ return S_OK; } -HRESULT WINAPI CBitBucket::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) +HRESULT WINAPI CRecycleBin::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) { FIXME("%p %lu %u %p %p %u\n", this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); @@ -867,17 +867,17 @@ } /************************************************************************* - * BitBucket IShellPropSheetExt interface + * RecycleBin IShellPropSheetExt interface */ -HRESULT WINAPI CBitBucket::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) +HRESULT WINAPI CRecycleBin::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) { FIXME("%p %p %lu\n", this, pfnAddPage, lParam); return E_NOTIMPL; } -HRESULT WINAPI CBitBucket::ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam) +HRESULT WINAPI CRecycleBin::ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam) { FIXME("%p %lu %p %lu\n", this, uPageID, pfnReplaceWith, lParam); @@ -885,10 +885,10 @@ } /************************************************************************* - * BitBucket IShellExtInit interface + * RecycleBin IShellExtInit interface */ -HRESULT WINAPI CBitBucket::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) +HRESULT WINAPI CRecycleBin::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { TRACE("%p %p %p %p\n", this, pidlFolder, pdtobj, hkeyProgID ); return S_OK; @@ -912,7 +912,7 @@ void -InitializeBitBucketDlg(HWND hwndDlg, WCHAR DefaultDrive) +InitializeRecycleBinDlg(HWND hwndDlg, WCHAR DefaultDrive) { WCHAR CurDrive = L'A'; WCHAR szDrive[] = L"A:\\"; @@ -1132,7 +1132,7 @@ INT_PTR CALLBACK -BitBucketDlg( +RecycleBinDlg( HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -1152,7 +1152,7 @@ { case WM_INITDIALOG: page = (PROPSHEETPAGE*)lParam; - InitializeBitBucketDlg(hwndDlg, (WCHAR)page->lParam); + InitializeRecycleBinDlg(hwndDlg, (WCHAR)page->lParam); dwStyle = (DWORD) SendDlgItemMessage(hwndDlg, 14000, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT; SendDlgItemMessage(hwndDlg, 14000, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); @@ -1260,7 +1260,7 @@ psh.phpage = hpsp; psh.hInstance = shell32_hInstance; - hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBucketDlg, (LPARAM)sDrive, NULL); + hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", RecycleBinDlg, (LPARAM)sDrive, NULL); if (!hprop) { ERR("Failed to create property sheet\n"); @@ -1362,7 +1362,7 @@ } /************************************************************************* - * SHUpdateCBitBucketIcon [SHELL32.@] + * SHUpdateCRecycleBinIcon [SHELL32.@] * * Undocumented */ Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h [iso-8859-1] Mon Nov 14 22:46:37 2011 @@ -22,8 +22,8 @@ #ifndef _SHFLDR_RECYCLEBIN_H_ #define _SHFLDR_RECYCLEBIN_H_ -class CBitBucket : - public CComCoClass<CBitBucket, &CLSID_RecycleBin>, +class CRecycleBin : + public CComCoClass<CRecycleBin, &CLSID_RecycleBin>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, @@ -36,8 +36,8 @@ INT iIdEmpty; public: - CBitBucket(); - ~CBitBucket(); + CRecycleBin(); + ~CRecycleBin(); // IPersistFolder virtual HRESULT WINAPI GetClassID(CLSID *pClassID); @@ -80,11 +80,11 @@ virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); DECLARE_REGISTRY_RESOURCEID(IDR_RECYCLEBIN) -DECLARE_NOT_AGGREGATABLE(CBitBucket) +DECLARE_NOT_AGGREGATABLE(CRecycleBin) DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CBitBucket) +BEGIN_COM_MAP(CRecycleBin) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder)

1 0

[rharabien] 54379: [SHELL32] - Export IContextMenu interface in RecycleBin object. Fixes recycle bin context menu. - Export IShellPropSheetExt interface too and fix order. See issue #6543 for more ...
by rharabien＠svn.reactos.org 14 Nov '11

14 Nov '11

Author: rharabien Date: Mon Nov 14 22:18:42 2011 New Revision: 54379 URL: http://svn.reactos.org/svn/reactos?rev=54379&view=rev Log: [SHELL32] - Export IContextMenu interface in RecycleBin object. Fixes recycle bin context menu. - Export IShellPropSheetExt interface too and fix order. See issue #6543 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.h trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.h [iso-8859-1] Mon Nov 14 22:18:42 2011 @@ -54,7 +54,7 @@ virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); - // *** ShellFolder2 methods *** + // *** IShellFolder2 methods *** virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.cpp [iso-8859-1] Mon Nov 14 22:18:42 2011 @@ -76,30 +76,6 @@ END_COM_MAP() }; -class CCBitBucketBackgroundContextMenu : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu2 -{ -private: - INT iIdEmpty; -public: - CCBitBucketBackgroundContextMenu(); - ~CCBitBucketBackgroundContextMenu(); - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - - // IContextMenu2 - virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); - -BEGIN_COM_MAP(CCBitBucketBackgroundContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) -END_COM_MAP() -}; - class CCBitBucketItemContextMenu : public CComObjectRootEx<CComMultiThreadModelNoCS>, public IContextMenu2 @@ -305,113 +281,6 @@ TRACE("Returning %d\n", ret); CloseRecycleBinHandle(hDeletedFile); return ret; -} - -/************************************************************************* - * BitBucket context menu - * - */ - -CCBitBucketBackgroundContextMenu::CCBitBucketBackgroundContextMenu() -{ - iIdEmpty = 0; -} - -CCBitBucketBackgroundContextMenu::~CCBitBucketBackgroundContextMenu() -{ -} - -HRESULT WINAPI CCBitBucketBackgroundContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) -{ - WCHAR szBuffer[100]; - MENUITEMINFOW mii; - int id = 1; - - TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); - - if (!hMenu) - return E_INVALIDARG; - - memset(&mii, 0, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; - mii.fState = MFS_ENABLED; - szBuffer[0] = L'\0'; - LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)); - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - mii.dwTypeData = szBuffer; - mii.cch = wcslen( mii.dwTypeData ); - mii.wID = idCmdFirst + id++; - mii.fType = MFT_STRING; - iIdEmpty = 1; - - if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) - return E_FAIL; - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); -} - -HRESULT WINAPI CCBitBucketBackgroundContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) -{ - HRESULT hr; - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV = NULL; - - TRACE("%p %p verb %p\n", this, lpcmi, lpcmi->lpVerb); - - if (LOWORD(lpcmi->lpVerb) == iIdEmpty) - { - // FIXME - // path & flags - hr = SHEmptyRecycleBinW(lpcmi->hwnd, L"C:\\", 0); - TRACE("result %x\n", hr); - if (hr != S_OK) - return hr; - - lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); - if (lpSB && SUCCEEDED(lpSB->QueryActiveShellView(&lpSV))) - lpSV->Refresh(); - } - return S_OK; -} - -HRESULT WINAPI CCBitBucketBackgroundContextMenu::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) -{ - FIXME("%p %lu %u %p %p %u\n", this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); - - return E_NOTIMPL; -} - -HRESULT WINAPI CCBitBucketBackgroundContextMenu::HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TRACE("CBitBucket_IContextMenu2Item_IContextMenu2Folder_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n", this, uMsg, wParam, lParam); - - return E_NOTIMPL; -} - -static HRESULT WINAPI CBitBucketBackgroundContextMenuConstructor(REFIID riid, LPVOID *ppv) -{ - CComObject<CCBitBucketBackgroundContextMenu> *theMenu; - CComPtr<IUnknown> result; - HRESULT hResult; - - TRACE("%s\n", shdebugstr_guid(&riid)); - - if (ppv == NULL) - return E_POINTER; - *ppv = NULL; - ATLTRY(theMenu = new CComObject<CCBitBucketBackgroundContextMenu>); - if (theMenu == NULL) - return E_OUTOFMEMORY; - hResult = theMenu->QueryInterface(riid, (void **)&result); - if (FAILED(hResult)) - { - delete theMenu; - return hResult; - } - *ppv = result.Detach(); - TRACE ("--(%p)\n", *ppv); - return S_OK; } /************************************************************************** @@ -563,6 +432,7 @@ CBitBucket::CBitBucket() { pidl = NULL; + iIdEmpty = 0; } CBitBucket::~CBitBucket() @@ -570,6 +440,41 @@ /* InterlockedDecrement(&objCount);*/ SHFree(pidl); } + +/************************************************************************* + * BitBucket IPersistFolder2 interface + */ + +HRESULT WINAPI CBitBucket::GetClassID(CLSID *pClassID) +{ + TRACE("(%p, %p)\n", this, pClassID); + if (pClassID == NULL) + return E_INVALIDARG; + memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); + return S_OK; +} + +HRESULT WINAPI CBitBucket::Initialize(LPCITEMIDLIST pidl) +{ + TRACE("(%p, %p)\n", this, pidl); + + SHFree((LPVOID)this->pidl); + this->pidl = ILClone(pidl); + if (this->pidl == NULL) + return E_OUTOFMEMORY; + return S_OK; +} + +HRESULT WINAPI CBitBucket::GetCurFolder(LPITEMIDLIST *ppidl) +{ + TRACE("\n"); + *ppidl = ILClone(pidl); + return S_OK; +} + +/************************************************************************* + * BitBucket IShellFolder2 interface + */ HRESULT WINAPI CBitBucket::ParseDisplayName(HWND hwnd, LPBC pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, LPITEMIDLIST *ppidl, @@ -656,7 +561,7 @@ } else if (IsEqualIID (riid, IID_IContextMenu) || IsEqualIID (riid, IID_IContextMenu2)) { - hr = CBitBucketBackgroundContextMenuConstructor(riid, ppv); + hr = this->QueryInterface(riid, ppv); } else if (IsEqualIID (riid, IID_IShellView)) { @@ -896,31 +801,87 @@ return S_OK; } -HRESULT WINAPI CBitBucket::GetClassID(CLSID *pClassID) -{ - TRACE("(%p, %p)\n", this, pClassID); - if (pClassID == NULL) +/************************************************************************* + * BitBucket IContextMenu interface + */ + +HRESULT WINAPI CBitBucket::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +{ + WCHAR szBuffer[100]; + MENUITEMINFOW mii; + int id = 1; + + TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); + + if (!hMenu) return E_INVALIDARG; - memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); - return S_OK; -} - -HRESULT WINAPI CBitBucket::Initialize(LPCITEMIDLIST pidl) -{ - TRACE("(%p, %p)\n", this, pidl); - - SHFree((LPVOID)this->pidl); - this->pidl = ILClone(pidl); - if (this->pidl == NULL) - return E_OUTOFMEMORY; - return S_OK; -} - -HRESULT WINAPI CBitBucket::GetCurFolder(LPITEMIDLIST *ppidl) -{ - TRACE("\n"); - *ppidl = ILClone(pidl); - return S_OK; + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; + mii.fState = MFS_ENABLED; + szBuffer[0] = L'\0'; + LoadStringW(shell32_hInstance, IDS_EMPTY_BITBUCKET, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)); + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; + mii.dwTypeData = szBuffer; + mii.cch = wcslen( mii.dwTypeData ); + mii.wID = idCmdFirst + id++; + mii.fType = MFT_STRING; + iIdEmpty = 1; + + if (!InsertMenuItemW(hMenu, indexMenu, TRUE, &mii)) + return E_FAIL; + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); +} + +HRESULT WINAPI CBitBucket::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi) +{ + HRESULT hr; + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV = NULL; + + TRACE("%p %p verb %p\n", this, lpcmi, lpcmi->lpVerb); + + if (LOWORD(lpcmi->lpVerb) == iIdEmpty) + { + // FIXME + // path & flags + hr = SHEmptyRecycleBinW(lpcmi->hwnd, L"C:\\", 0); + TRACE("result %x\n", hr); + if (hr != S_OK) + return hr; + + lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (lpSB && SUCCEEDED(lpSB->QueryActiveShellView(&lpSV))) + lpSV->Refresh(); + } + return S_OK; +} + +HRESULT WINAPI CBitBucket::GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen) +{ + FIXME("%p %lu %u %p %p %u\n", this, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + return E_NOTIMPL; +} + +/************************************************************************* + * BitBucket IShellPropSheetExt interface + */ + +HRESULT WINAPI CBitBucket::AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam) +{ + FIXME("%p %p %lu\n", this, pfnAddPage, lParam); + + return E_NOTIMPL; +} + +HRESULT WINAPI CBitBucket::ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam) +{ + FIXME("%p %lu %p %lu\n", this, uPageID, pfnReplaceWith, lParam); + + return E_NOTIMPL; } /************************************************************************* Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.h [iso-8859-1] Mon Nov 14 22:18:42 2011 @@ -27,13 +27,24 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, + public IContextMenu, + public IShellPropSheetExt, public IShellExtInit { private: LPITEMIDLIST pidl; + INT iIdEmpty; + public: CBitBucket(); ~CBitBucket(); + + // IPersistFolder + virtual HRESULT WINAPI GetClassID(CLSID *pClassID); + virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); + + // IPersistFolder2 + virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); // IShellFolder virtual HRESULT WINAPI ParseDisplayName (HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, DWORD *pchEaten, LPITEMIDLIST *ppidl, DWORD *pdwAttributes); @@ -47,7 +58,7 @@ virtual HRESULT WINAPI GetDisplayNameOf(LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet); virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut); - /* ShellFolder2 */ + // IShellFolder2 virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); @@ -56,14 +67,14 @@ virtual HRESULT WINAPI GetDetailsOf(LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS *psd); virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); - // IPersist - virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand,UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); - // IPersistFolder - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidl); - - // IPersistFolder2 - virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + // IShellPropSheetExt + virtual HRESULT WINAPI AddPages(LPFNSVADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); + virtual HRESULT WINAPI ReplacePage(EXPPS uPageID, LPFNSVADDPROPSHEETPAGE pfnReplaceWith, LPARAM lParam); // IShellExtInit virtual HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); @@ -74,11 +85,12 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CBitBucket) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) + COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) - COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) - COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) - COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) END_COM_MAP() };

1 0

[jimtabor] 54378: - Fix RosApps build.
by jimtabor＠svn.reactos.org 14 Nov '11

14 Nov '11

Author: jimtabor Date: Mon Nov 14 22:14:52 2011 New Revision: 54378 URL: http://svn.reactos.org/svn/reactos?rev=54378&view=rev Log: - Fix RosApps build. Modified: trunk/rosapps/applications/sysutils/regexpl/ph.h Modified: trunk/rosapps/applications/sysutils/regexpl/ph.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/ph.h [iso-8859-1] Mon Nov 14 22:14:52 2011 @@ -21,8 +21,8 @@ #include <stdarg.h> #include <windef.h> +#include <winbase.h> #include <wincon.h> -#include <winbase.h> #include <wingdi.h> #include <winuser.h> #include <winreg.h>

1 0

[tfaber] 54377: [ADVAPI32_WINETEST] - Make the Spooler -> Eventlog hack complete instead of half-doing it. "Fixes" test failure on Windows. See r53502
by tfaber＠svn.reactos.org 14 Nov '11

14 Nov '11

Author: tfaber Date: Mon Nov 14 18:43:26 2011 New Revision: 54377 URL: http://svn.reactos.org/svn/reactos?rev=54377&view=rev Log: [ADVAPI32_WINETEST] - Make the Spooler -> Eventlog hack complete instead of half-doing it. "Fixes" test failure on Windows. See r53502 Modified: trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Mon Nov 14 18:43:26 2011 @@ -145,7 +145,8 @@ /* Proper SCM handle but different access rights */ scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); SetLastError(0xdeadbeef); - svc_handle = OpenServiceA(scm_handle, "Spooler", GENERIC_WRITE); + /* ReactOS. See top of the file */ + svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_WRITE); if (!svc_handle && (GetLastError() == ERROR_ACCESS_DENIED)) skip("Not enough rights to get a handle to the service\n"); else @@ -433,7 +434,8 @@ WCHAR displaynameW[2048]; DWORD displaysize, tempsize, tempsizeW; static const CHAR deadbeef[] = "Deadbeef"; - static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; + /* ReactOS. See top of the file */ + static const WCHAR spoolerW[] = {'E','v','e','n','t','l','o','g',0}; static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; static const WCHAR abcW[] = {'A','B','C',0}; static const CHAR servicename[] = "Winetest";

1 0

[jimtabor] 54376: [Win32k|User32] - Fix broadcast message, pass all wine tests. Code consolidation next round.
by jimtabor＠svn.reactos.org 14 Nov '11

14 Nov '11

Author: jimtabor Date: Mon Nov 14 15:20:48 2011 New Revision: 54376 URL: http://svn.reactos.org/svn/reactos?rev=54376&view=rev Log: [Win32k|User32] - Fix broadcast message, pass all wine tests. Code consolidation next round. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Mon Nov 14 15:20:48 2011 @@ -2728,7 +2728,7 @@ if (pci->CallbackWnd.hWnd == UMMsg.hwnd) pWnd = pci->CallbackWnd.pWnd; - + CallbackArgs->Result = IntCallWindowProcW( CallbackArgs->IsAnsiProc, CallbackArgs->Proc, pWnd, @@ -3059,16 +3059,13 @@ if (dwflags & BSF_LUID) parm.luid = pBSMInfo->luid; - if (*lpdwRecipients & BSM_APPLICATIONS) - { - ret = NtUserMessageCall(GetDesktopWindow(), - uiMessage, - wParam, - lParam, - (ULONG_PTR)&parm, - FNID_BROADCASTSYSTEMMESSAGE, - Ansi); - } + ret = NtUserMessageCall(GetDesktopWindow(), + uiMessage, + wParam, + lParam, + (ULONG_PTR)&parm, + FNID_BROADCASTSYSTEMMESSAGE, + Ansi); if (!ret) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Nov 14 15:20:48 2011 @@ -2066,7 +2066,7 @@ break; case FNID_BROADCASTSYSTEMMESSAGE: { - BROADCASTPARM parm; + BROADCASTPARM parm, *retparam; DWORD_PTR RetVal = 0; if (ResultInfo) @@ -2086,53 +2086,286 @@ break; if ( parm.recipients & BSM_ALLDESKTOPS || - parm.recipients == BSM_ALLCOMPONENTS ) - { - } - else if (parm.recipients & BSM_APPLICATIONS) - { - if (parm.flags & BSF_QUERY) - { - if (parm.flags & BSF_FORCEIFHUNG || parm.flags & BSF_NOHANG) - { - co_IntSendMessageTimeout( HWND_BROADCAST, + parm.recipients == BSM_ALLCOMPONENTS ) + { + PLIST_ENTRY DesktopEntry; + PDESKTOP rpdesk; + HWND *List, hwndDenied = NULL; + HDESK hDesk = NULL; + PWND pwnd, pwndDesk; + ULONG i; + UINT fuFlags; + + for (DesktopEntry = InputWindowStation->DesktopListHead.Flink; + DesktopEntry != &InputWindowStation->DesktopListHead; + DesktopEntry = DesktopEntry->Flink) + { + rpdesk = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry); + pwndDesk = rpdesk->pDeskInfo->spwnd; + List = IntWinListChildren(pwndDesk); + + if (parm.flags & BSF_QUERY) + { + if (List != NULL) + { + if (parm.flags & BSF_FORCEIFHUNG || parm.flags & BSF_NOHANG) + { + fuFlags = SMTO_ABORTIFHUNG; + } + else if (parm.flags & BSF_NOTIMEOUTIFNOTHUNG) + { + fuFlags = SMTO_NOTIMEOUTIFNOTHUNG; + } + else + { + fuFlags = SMTO_NORMAL; + } + co_IntSendMessageTimeout( UserHMGetHandle(pwndDesk), Msg, wParam, lParam, - SMTO_ABORTIFHUNG, + fuFlags, 2000, &RetVal); - } - else if (parm.flags & BSF_NOTIMEOUTIFNOTHUNG) - { - co_IntSendMessageTimeout( HWND_BROADCAST, + Ret = TRUE; + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + co_IntSendMessageTimeout( List[i], + Msg, + wParam, + lParam, + fuFlags, + 2000, + &RetVal); + + if (!RetVal && EngGetLastError() == ERROR_TIMEOUT) + { + if (!(parm.flags & BSF_FORCEIFHUNG)) + Ret = FALSE; + } + if (RetVal == BROADCAST_QUERY_DENY) + { + hwndDenied = List[i]; + hDesk = UserHMGetHandle(pwndDesk); + Ret = FALSE; + } + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + _SEH2_TRY + { + retparam = (PBROADCASTPARM) ResultInfo; + retparam->hDesk = hDesk; + retparam->hWnd = hwndDenied; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(break); + } + _SEH2_END; + if (!Ret) break; // Have a hit! Let everyone know! + } + } + else if (parm.flags & BSF_POSTMESSAGE) + { + if (List != NULL) + { + UserPostMessage(UserHMGetHandle(pwndDesk), Msg, wParam, lParam); + + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + UserPostMessage(List[i], Msg, wParam, lParam); + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + Ret = TRUE; + } + else + { + if (List != NULL) + { + UserSendNotifyMessage(UserHMGetHandle(pwndDesk), Msg, wParam, lParam); + + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + UserSendNotifyMessage(List[i], Msg, wParam, lParam); + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + Ret = TRUE; + } + } + } + else if (parm.recipients & BSM_APPLICATIONS) + { + HWND *List, hwndDenied = NULL; + HDESK hDesk = NULL; + PWND pwnd, pwndDesk; + ULONG i; + UINT fuFlags; + + pwndDesk = UserGetWindowObject(IntGetDesktopWindow()); + List = IntWinListChildren(pwndDesk); + + if (parm.flags & BSF_QUERY) + { + if (List != NULL) + { + if (parm.flags & BSF_FORCEIFHUNG || parm.flags & BSF_NOHANG) + { + fuFlags = SMTO_ABORTIFHUNG; + } + else if (parm.flags & BSF_NOTIMEOUTIFNOTHUNG) + { + fuFlags = SMTO_NOTIMEOUTIFNOTHUNG; + } + else + { + fuFlags = SMTO_NORMAL; + } + co_IntSendMessageTimeout( UserHMGetHandle(pwndDesk), + Msg, + wParam, + lParam, + fuFlags, + 2000, + &RetVal); + Ret = TRUE; + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + co_IntSendMessageTimeout( List[i], Msg, wParam, lParam, - SMTO_NOTIMEOUTIFNOTHUNG, + fuFlags, 2000, &RetVal); - } - else - { - co_IntSendMessageTimeout( HWND_BROADCAST, - Msg, - wParam, - lParam, - SMTO_NORMAL, - 2000, - &RetVal); - } - Ret = RetVal; - } - else if (parm.flags & BSF_POSTMESSAGE) - { - Ret = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); - } - else //Everything else,,,, if ( parm.flags & BSF_SENDNOTIFYMESSAGE) - { - Ret = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); - } + + if (!RetVal && EngGetLastError() == ERROR_TIMEOUT) + { + if (!(parm.flags & BSF_FORCEIFHUNG)) + Ret = FALSE; + } + if (RetVal == BROADCAST_QUERY_DENY) + { + hwndDenied = List[i]; + hDesk = UserHMGetHandle(pwndDesk); + Ret = FALSE; + } + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + _SEH2_TRY + { + retparam = (PBROADCASTPARM) ResultInfo; + retparam->hDesk = hDesk; + retparam->hWnd = hwndDenied; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(break); + } + _SEH2_END; + } + } + else if (parm.flags & BSF_POSTMESSAGE) + { + if (List != NULL) + { + UserPostMessage(UserHMGetHandle(pwndDesk), Msg, wParam, lParam); + + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + UserPostMessage(List[i], Msg, wParam, lParam); + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + Ret = TRUE; + } + else + { + if (List != NULL) + { + UserSendNotifyMessage(UserHMGetHandle(pwndDesk), Msg, wParam, lParam); + + for (i = 0; List[i]; i++) + { + pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + if ( parm.flags & BSF_IGNORECURRENTTASK ) + { + if ( pwnd->head.pti->MessageQueue == gptiCurrent->MessageQueue ) + continue; + } + UserSendNotifyMessage(List[i], Msg, wParam, lParam); + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + Ret = TRUE; + } } } break;

1 0

[spetreolle] 54375: [NDK] Fix definition of RtlExtendedLargeIntegerDivide.
by spetreolle＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: spetreolle Date: Sun Nov 13 23:47:21 2011 New Revision: 54375 URL: http://svn.reactos.org/svn/reactos?rev=54375&view=rev Log: [NDK] Fix definition of RtlExtendedLargeIntegerDivide. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Nov 13 23:47:21 2011 @@ -3555,8 +3555,23 @@ return Product; } -#endif - +#if defined(_AMD64_) || defined(_IA64_) +static __inline +LARGE_INTEGER +NTAPI_INLINE +RtlExtendedLargeIntegerDivide( + IN LARGE_INTEGER Dividend, + IN ULONG Divisor, + OUT PULONG Remainder OPTIONAL) +{ + LARGE_INTEGER ret; + ret.QuadPart = (ULONG64)Dividend.QuadPart / Divisor; + if (Remainder) + *Remainder = (ULONG)(Dividend.QuadPart % Divisor); + return ret; +} + +#else NTSYSAPI LARGE_INTEGER NTAPI @@ -3565,6 +3580,11 @@ IN ULONG Divisor, OUT PULONG Remainder OPTIONAL ); + +#endif /* defined(_AMD64_) || defined(_IA64_) */ + +#endif + NTSYSAPI ULONG

1 0

[khornicek] 54374: [TRANSLATION] Fix Czech resources that got broken by the UTF8 conversion.
by khornicek＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: khornicek Date: Sun Nov 13 16:27:03 2011 New Revision: 54374 URL: http://svn.reactos.org/svn/reactos?rev=54374&view=rev Log: [TRANSLATION] Fix Czech resources that got broken by the UTF8 conversion. Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/system/format/lang/cs-CZ.rc trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc trunk/reactos/base/system/rundll32/lang/cs-CZ.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/base/system/winlogon/lang/cs-CZ.rc Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -11,9 +11,9 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "VÃtejte v prÃ¹vodci instalace systÃ©mu ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "SystÃ©m ReactOS zatÃm nelze nainstalovat pÃ¸Ãmo z tohoto CD! Pro instalaci restartuje poÃ¨ÃtaÃ¨ z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "KlepnutÃm na DokonÃ¨it ukonÃ¨Ãte instalaci.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "VÃtejte v prÅ¯vodci instalace systÃ©mu ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "SystÃ©m ReactOS zatÃm nelze nainstalovat pÅÃmo z tohoto CD! Pro instalaci restartuje poÄÃtaÄ z tohoto CD.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "KlepnutÃm na DokonÄit ukonÄÃte instalaci.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -24,7 +24,7 @@ CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 CONTROL "Jazyk instalace:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "KlÃ¡vesnice Ã¨i metoda zadÃ¡vÃ¡nÃ:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "KlÃ¡vesnice Äi metoda zadÃ¡vÃ¡nÃ:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© zvolit typ instalace.", IDC_STATIC, 10, 180 ,297, 10 END @@ -37,7 +37,7 @@ CONTROL "Typ instalace", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Nainstalovat systÃ©m ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 CONTROL "Opravit nebo aktualizovat jiÅ¾ nainstalovanÃ½ systÃ©m ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit zaÃ¸ÃzenÃ.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit zaÅÃzenÃ.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -45,14 +45,14 @@ CAPTION "Instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "NastavenÃ zaÃ¸ÃzenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "PoÃ¨ÃtaÃ¨:", IDC_STATIC, 20,15, 80, 10 + CONTROL "NastavenÃ zaÅÃzenÃ", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "PoÄÃtaÄ:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "KlÃ¡vesnice:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit instalaÃ¨nÃ zaÃ¸ÃzenÃ.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© nastavit instalaÄnÃ zaÅÃzenÃ.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -62,20 +62,20 @@ BEGIN CONTROL "OddÃl, do kterÃ©ho bude systÃ©m ReactOS nainstalovÃ¡n", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&VytvoÃ¸it", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&VytvoÅit", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&OvladaÃ¨", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&PokroÃ¨ilÃ© volby...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "&OvladaÄ", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&PokroÄilÃ© volby...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Po klepnutÃ na DalÅ¡Ã bude moÅ¾nÃ© zkontrolovat vÅ¡echna nastavenÃ.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "VytvoÃ¸it oddÃl" +CAPTION "VytvoÅit oddÃl" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "VytvoÃ¸it a naformÃ¡tovat oddÃl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + CONTROL "VytvoÅit a naformÃ¡tovat oddÃl",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 LTEXT "Velikost:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP LTEXT "GB",IDC_UNIT, 117,24,14,9 @@ -87,17 +87,17 @@ IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "PokroÃ¨ilÃ¡ nastavenÃ oddÃlu" +CAPTION "PokroÄilÃ¡ nastavenÃ oddÃlu" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "InstalaÃ¨nÃ sloÅ¾ka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "InstalaÄnÃ sloÅ¾ka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalace zavadÃ¬Ã¨e", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 + CONTROL "Instalace zavadÄÄe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Nainstalovat zavadÃ¬Ã¨ na pevnÃ½ disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Nainstalovat zavadÃ¬Ã¨ na pevnÃ½ disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "ZavadÃ¬Ã¨ neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + CONTROL "Nainstalovat zavadÄÄ na pevnÃ½ disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Nainstalovat zavadÄÄ na pevnÃ½ disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "ZavadÄÄ neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE PUSHBUTTON "&Storno", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END @@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "ShrnutÃ instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÃ¨nÃ proces.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "KlepnutÃm na DalÅ¡Ã zahÃ¡jÃte instalaÄnÃ proces.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Akce instalace", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Instalace souborÃ¹...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "Instalace souborÅ¯...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -125,34 +125,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "DokonÃ¨enÃ instalace systÃ©mu ReactOS" +CAPTION "DokonÄenÃ instalace systÃ©mu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "DokonÃ¨enÃ prvnÃ Ã¨Ã¡sti instalace systÃ©mu ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "PrvnÃ Ã¨Ã¡st instalace systÃ©mu ReactOS byla ÃºspÃ¬Å¡nÃ¬ dokonÃ¨ena.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "DokonÄenÃ prvnÃ ÄÃ¡sti instalace systÃ©mu ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "PrvnÃ ÄÃ¡st instalace systÃ©mu ReactOS byla ÃºspÄÅ¡nÄ dokonÄena.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Po klepnutÃ na DokonÃ¨it bude poÃ¨ÃtaÃ¨ restartovÃ¡n.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Po klepnutÃ na DokonÄit bude poÄÃtaÄ restartovÃ¡n.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Pokud je v mechanice instalaÃ¨nÃ CD, vyjmÃ¬te jej. PotÃ© kliknutÃm na DokonÃ¨it restartujte poÃ¨ÃtaÃ¨.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Pokud je v mechanice instalaÄnÃ CD, vyjmÄte jej. PotÃ© kliknutÃm na DokonÄit restartujte poÄÃtaÄ.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "VÃ½bÃ¬r jazyka" - IDS_LANGSUBTITLE "Volba jazyka, kterÃ½ bude pouÅ¾it pÃ¸i instalaci a ve vÃ½slednÃ©m systÃ©mu." - IDS_TYPETITLE "VÃtejte v prÃ¹vodci instalace systÃ©mu ReactOS" + IDS_LANGTITLE "VÃ½bÄr jazyka" + IDS_LANGSUBTITLE "Volba jazyka, kterÃ½ bude pouÅ¾it pÅi instalaci a ve vÃ½slednÃ©m systÃ©mu." + IDS_TYPETITLE "VÃtejte v prÅ¯vodci instalace systÃ©mu ReactOS" IDS_TYPESUBTITLE "Volba typu instalace." - IDS_DEVICETITLE "NastavenÃ zÃ¡kladnÃch zaÃ¸ÃzenÃ" + IDS_DEVICETITLE "NastavenÃ zÃ¡kladnÃch zaÅÃzenÃ" IDS_DEVICESUBTITLE "Volba nastavenÃ obrazovky a klÃ¡vesnice." - IDS_DRIVETITLE "NastavenÃ instalaÃ¨nÃho oddÃlu a systÃ©movÃ© sloÅ¾ky" - IDS_DRIVESUBTITLE "PÃ¸Ãprava instalaÃ¨nÃho oddÃlu, systÃ©movÃ© sloÅ¾ky a zavadÃ¬Ã¨e." - IDS_PROCESSTITLE "PÃ¸Ãprava oddÃlu, kopÃrovÃ¡nÃ souborÃ¹ a nastavenÃ systÃ©mu" - IDS_PROCESSSUBTITLE "VytvoÃ¸enÃ a naformÃ¡tovÃ¡nÃ oddÃlu, kopÃrovÃ¡nÃ souborÃ¹, instalace a nastavenÃ zavadÃ¬Ã¨e" - IDS_RESTARTTITLE "PrvnÃ Ã¨Ã¡st instalace dokonÃ¨ena" - IDS_RESTARTSUBTITLE "PrvnÃ Ã¨Ã¡st instalace byla dokonÃ¨ena, po restartovÃ¡nÃ poÃ¨ÃtaÃ¨e se bude pokraÃ¨ovat druhou Ã¨Ã¡stÃ" + IDS_DRIVETITLE "NastavenÃ instalaÄnÃho oddÃlu a systÃ©movÃ© sloÅ¾ky" + IDS_DRIVESUBTITLE "PÅÃprava instalaÄnÃho oddÃlu, systÃ©movÃ© sloÅ¾ky a zavadÄÄe." + IDS_PROCESSTITLE "PÅÃprava oddÃlu, kopÃrovÃ¡nÃ souborÅ¯ a nastavenÃ systÃ©mu" + IDS_PROCESSSUBTITLE "VytvoÅenÃ a naformÃ¡tovÃ¡nÃ oddÃlu, kopÃrovÃ¡nÃ souborÅ¯, instalace a nastavenÃ zavadÄÄe" + IDS_RESTARTTITLE "PrvnÃ ÄÃ¡st instalace dokonÄena" + IDS_RESTARTSUBTITLE "PrvnÃ ÄÃ¡st instalace byla dokonÄena, po restartovÃ¡nÃ poÄÃtaÄe se bude pokraÄovat druhou ÄÃ¡stÃ" IDS_SUMMARYTITLE "ShrnutÃ instalace" - IDS_SUMMARYSUBTITLE "VÃ½pis voleb instalace k ovÃ¬Ã¸enÃ pÃ¸ed tÃm, neÅ¾ zaÃ¨ne instalace" - IDS_ABORTSETUP "SystÃ©m ReactOS nenÃ na tomto poÃ¨ÃtaÃ¨i kompletnÃ¬ nainstalovanÃ½. Pokud nynÃ ukonÃ¨Ãte instalaci, bude ji pro nainstalovÃ¡nÃ systÃ©mu ReactOS nutnÃ© provÃ©st znova. Opravdu ukonÃ¨it?" - IDS_ABORTSETUP2 "PÃ¸eruÅ¡it instalaci?" + IDS_SUMMARYSUBTITLE "VÃ½pis voleb instalace k ovÄÅenÃ pÅed tÃm, neÅ¾ zaÄne instalace" + IDS_ABORTSETUP "SystÃ©m ReactOS nenÃ na tomto poÄÃtaÄi kompletnÄ nainstalovanÃ½. Pokud nynÃ ukonÄÃte instalaci, bude ji pro nainstalovÃ¡nÃ systÃ©mu ReactOS nutnÃ© provÃ©st znova. Opravdu ukonÄit?" + IDS_ABORTSETUP2 "PÅeruÅ¡it instalaci?" END /* EOF */ Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -2,24 +2,24 @@ IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ReactOS zjistil, Å¾e bÃ¬Å¾Ã pod VMware(r).", -1, 117, 8, 140, 24 - LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaÃ¨ klepnÃ¬te na 'DalÅ¡Ã', pokud ovladaÃ¨ instalovat nechcete, klepnÃ¬te na 'Storno'.", -1, 117, 140, 140, 24 + LTEXT "ReactOS zjistil, Å¾e je spuÅ¡tÄn pod VMware(r).", -1, 117, 8, 140, 24 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaÄ kliknÄte na 'DalÅ¡Ã', pokud ovladaÄ instalovat nechcete, klepnÄte na 'Storno'.", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "StandardnÃ instalace ReactOS neobsahuje VMware(r) SVGA ovladaÃ¨.\n\nProto musÃte v oknÃ¬ VMware(r) workstation vybrat nabÃdku 'VM' a zvolit poloÅ¾ku 'Install VMware tools...'\n\n\nKlepnÃ¬te na 'DalÅ¡Ã' pro pokraÃ¨ovÃ¡nÃ nebo 'Storno' pro pÃ¸eskoÃ¨enÃ instalace SVGA ovladaÃ¨e.",-1,25,25,225,85 + LTEXT "StandardnÃ instalace ReactOS neobsahuje VMware(r) SVGA ovladaÄ.\n\nProto musÃte v oknÄ VMware(r) workstation vybrat nabÃdku 'VM' a zvolit poloÅ¾ku 'Install VMware tools...'\n\n\nKlepnÄte na 'DalÅ¡Ã' pro pokraÄovÃ¡nÃ nebo 'Storno' pro pÅeskoÄenÃ instalace SVGA ovladaÄe.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 @@ -28,10 +28,10 @@ IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "OvladaÃ¨ obrazovky VMware(r) SVGA byl ÃºspÃ¬Å¡nÃ¬ nainstalovÃ¡n. NynÃ, prosÃm, vyberte preferovanÃ© rozliÅ¡enÃ obrazovky:",-1,25,5,225,20 + LTEXT "OvladaÄ obrazovky VMware(r) SVGA byl ÃºspÄÅ¡nÄ nainstalovÃ¡n. NynÃ, prosÃm, vyberte preferovanÃ© rozliÅ¡enÃ obrazovky:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -49,59 +49,59 @@ IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaÃ¨.\n\n\nKlepnÃ¬te na 'DokonÃ¨it' pro pokraÃ¨ovÃ¡nÃ v instalaÃ¨nÃm procesu.",-1,25,25,225,85 + LTEXT "Nelze nainstalovat VMware(r) SVGA ovladaÄ.\n\n\nKlepnÄte na 'DokonÄit' pro pokraÄovÃ¡nÃ v instalaÄnÃm procesu.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "OvladaÃ¨ VMware(r) SVGA je jiÅ¾ nainstalovÃ¡n.\n\nNynÃ, prosÃm, zvolte, co chete provÃ©st:",-1,25,5,225,30 + LTEXT "OvladaÄ VMware(r) SVGA je jiÅ¾ nainstalovÃ¡n.\n\nNynÃ, prosÃm, zvolte, co chete provÃ©st:",-1,25,5,225,30 PUSHBUTTON "Upravit nastavenÃ obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "PouÅ¾Ãt jinÃ½ grafickÃ½ ovladaÃ¨", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "Odebrat ovladaÃ¨ VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "KlepnÃ¬te na 'DalÅ¡Ã' pro pokraÃ¨ovÃ¡nÃ nebo na 'Storno' pro ukonÃ¨enÃ prÃ¹vodce.", -1, 25, 93, 225, 19 + PUSHBUTTON "PouÅ¾Ãt jinÃ½ grafickÃ½ ovladaÄ", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Odebrat ovladaÄ VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "KlepnÄte na 'DalÅ¡Ã' pro pokraÄovÃ¡nÃ nebo na 'Storno' pro ukonÄenÃ prÅ¯vodce.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Vyberte, prosÃm, grafickÃ½ ovladaÃ¨, kterÃ½ chcete pouÅ¾Ãt:",-1,25,25,225,15 - PUSHBUTTON "ReactOS VGA ovladaÃ¨", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON - PUSHBUTTON "ReactOS VBE ovladaÃ¨ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "KlepnÃ¬te na 'DokonÃ¨it' pro dokonÃ¨enÃ operace nebo na 'Storno' pro ukonÃ¨enÃ nastavenÃ beze zmÃ¬n.", -1, 25, 93, 225, 20 + LTEXT "Vyberte, prosÃm, grafickÃ½ ovladaÄ, kterÃ½ chcete pouÅ¾Ãt:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA ovladaÄ", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE ovladaÄ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "KlepnÄte na 'DokonÄit' pro dokonÄenÃ operace nebo na 'Storno' pro ukonÄenÃ nastavenÃ beze zmÄn.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace ovladaÃ¨e obrazovky" +CAPTION "Instalace ovladaÄe obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "NynÃ bude odebrÃ¡n ovladaÃ¨ VMware(r) SVGA!!!\n\n\nKlepnÃ¬te na 'DokonÃ¨it' pro odebrÃ¡nÃ ovladaÃ¨e nebo na 'Storno' pro ponechÃ¡nÃ.",-1,25,25,225,85 + LTEXT "NynÃ bude odebrÃ¡n ovladaÄ VMware(r) SVGA!!!\n\n\nKlepnÄte na 'DokonÄit' pro odebrÃ¡nÃ ovladaÄe nebo na 'Storno' pro ponechÃ¡nÃ.",-1,25,25,225,85 END STRINGTABLE BEGIN - IDS_WIZARD_NAME "DetekovÃ¡no prostÃ¸edÃ VMware(r)" - IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemÃ¹Å¾e nalÃ©zt poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÃ¬ vloÅ¾eno." - IDS_FAILEDTOCOPYFILES "Nelze zkopÃrovat poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÃ¬ vloÅ¾eno.\n" - IDS_FAILEDTOACTIVATEDRIVER "NepodaÃ¸ilo se zaktivovat VMware(r) SVGA ovladaÃ¨!" - IDS_FAILEDTOSELVGADRIVER "NepodaÃ¸ilo se zaktivovat ReactOS VGA ovladaÃ¨!" - IDS_FAILEDTOSELVBEDRIVER "NepodaÃ¸ilo se zaktivovat ReactOS VBE ovladaÃ¨!" - IDS_UNINSTNOTICE "PodpÃ¹rnÃ© soubory VMware(r) SVGA ovladaÃ¨e nebyly odstranÃ¬ny.\nSmaÅ¾te je, prosÃm, po restarovÃ¡nÃ systÃ©mu." - IDS_FAILEDTOADDREGENTRIES "NepodaÃ¸ilo se vytvoÃ¸it v registru zÃ¡pis pro VMware(r) SVGA ovladaÃ¨!" + IDS_WIZARD_NAME "DetekovÃ¡no prostÅedÃ VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "ReactOS nemÅ¯Å¾e nalÃ©zt poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÄ vloÅ¾eno." + IDS_FAILEDTOCOPYFILES "Nelze zkopÃrovat poÅ¾adovanÃ© soubory.\nZkontrolujte, prosÃm, zda je VMware(r) tools CD-ROM sprÃ¡vnÄ vloÅ¾eno.\n" + IDS_FAILEDTOACTIVATEDRIVER "NepodaÅilo se zaktivovat VMware(r) SVGA ovladaÄ!" + IDS_FAILEDTOSELVGADRIVER "NepodaÅilo se zaktivovat ReactOS VGA ovladaÄ!" + IDS_FAILEDTOSELVBEDRIVER "NepodaÅilo se zaktivovat ReactOS VBE ovladaÄ!" + IDS_UNINSTNOTICE "PodpÅ¯rnÃ© soubory VMware(r) SVGA ovladaÄe nebyly odstranÄny.\nSmaÅ¾te je, prosÃm, po restarovÃ¡nÃ systÃ©mu." + IDS_FAILEDTOADDREGENTRIES "NepodaÅilo se vytvoÅit v registru zÃ¡pis pro VMware(r) SVGA ovladaÄ!" END STRINGTABLE BEGIN 10001 "NejniÅ¾Å¡Ã (8BPP)" - 10002 "StÃ¸ednÃ (16BPP)" + 10002 "StÅednÃ (16BPP)" 10003 "NejvyÅ¡Å¡Ã (32BPP)" END @@ -109,23 +109,23 @@ BEGIN IDS_SEARCHINGFORCDROM "HledÃ¡ se VMware(r) Tools CD-ROM..." IDS_COPYINGFILES "kopÃrujÃ se soubory..." - IDS_ENABLINGDRIVER "ZavÃ¡dÃ se ovladaÃ¨ VMware(r) SVGA..." + IDS_ENABLINGDRIVER "ZavÃ¡dÃ se ovladaÄ VMware(r) SVGA..." END STRINGTABLE BEGIN - IDD_INSERT_VMWARE_TOOLSTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSERT_VMWARE_TOOLSTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_INSERT_VMWARE_TOOLSSUBTITLE "VloÅ¾te, prosÃm, VMware(r) tools CD-ROM." - IDD_INSTALLING_VMWARE_TOOLSTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VyhledÃ¡nÃ a kopÃrovÃ¡nÃ VMware (r) SVGA ovladaÃ¨e." - IDD_CONFIGTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSTALLING_VMWARE_TOOLSTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "VyhledÃ¡nÃ a kopÃrovÃ¡nÃ VMware (r) SVGA ovladaÄe." + IDD_CONFIGTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_CONFIGSUBTITLE "Vyberte, prosÃm, preferovanÃ© rozliÅ¡enÃ obrazovky:" - IDD_INSTALLATION_FAILEDTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaÃ¨e VMware (r) SVGA selhala." - IDD_CHOOSEACTIONTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" + IDD_INSTALLATION_FAILEDTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_INSTALLATION_FAILEDSUBTITLE "Instalace ovladaÄe VMware (r) SVGA selhala." + IDD_CHOOSEACTIONTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" IDD_CHOOSEACTIONSUBTITLE "Zvolte, prosÃm, co chete provÃ©st." - IDD_SELECTDRIVERTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaÃ¨." - IDD_DOUNINSTALLTITLE "PrÃ¹vodce instalacÃ VMware (r) SVGA ovladaÃ¨e" - IDD_DOUNINSTALLSUBTITLE "OdstranÃ¬nÃ ovladaÃ¨e." + IDD_SELECTDRIVERTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_SELECTDRIVERSUBTITLE "Vyberte ovladaÄ." + IDD_DOUNINSTALLTITLE "PrÅ¯vodce instalacÃ VMware (r) SVGA ovladaÄe" + IDD_DOUNINSTALLSUBTITLE "OdstranÄnÃ ovladaÄe." END Modified: trunk/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/cs… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,7 +7,7 @@ BEGIN IDS_APPTITLE "ReactOS - VÃtejte" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "VÃtejte v operaÃ¨nÃm systÃ©mu ReactOS.\n\nKlepnÃ¬te na tlaÃ¨Ãtko v levÃ©m sloupci." + IDS_DEFAULTTOPICDESC "VÃtejte v operaÄnÃm systÃ©mu ReactOS.\n\nKlepnÄte na tlaÄÃtko v levÃ©m sloupci." // IDS_CHECKTEXT "Zobrazit dialog znovu" // IDS_CLOSETEXT "Konec" END @@ -45,9 +45,9 @@ /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Nainstaluje ReactOS na VÃ¡Å¡ poÃ¨ÃtaÃ¨ nebo zaktualizuje existujÃcÃ systÃ©m." + IDS_TOPICDESC0 "Nainstaluje ReactOS na VÃ¡Å¡ poÄÃtaÄ nebo zaktualizuje existujÃcÃ systÃ©m." IDS_TOPICDESC1 "ProhlÃÅ¾et toto CD." - IDS_TOPICDESC2 "KlepnÃ¬te pro ukonÃ¨enÃ tohoto programu." + IDS_TOPICDESC2 "KlepnÄte pro ukonÄenÃ tohoto programu." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." // IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." // IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -39,8 +39,8 @@ BEGIN MENUITEM "&OvlÃ¡dacÃ panely", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&ZabezpeÃ¨enÃ...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "&SÃÂovÃ¡ pÃ¸ipojenÃ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&ZabezpeÄenÃ...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&SÃÅ¥ovÃ¡ pÅipojenÃ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&TiskÃ¡rny a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&HlavnÃ panel a nabÃdka Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END @@ -48,13 +48,13 @@ BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "NÃ¡povÃ¬d&a a odbornÃ¡ pomoc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "NÃ¡povÄd&a a odbornÃ¡ pomoc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Spustit...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynchronizovat", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "Odh&lÃ¡sit %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "Odpoj&it...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "Odpo&jit poÃ¨ÃtaÃ¨ z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Odpo&jit poÄÃtaÄ z doku", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "&Vypnout...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -70,8 +70,8 @@ AUTOCHECKBOX "Uzamknout &hlavnÃ panel", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Automaticky sktÃ½vat hlavnÃ panel", IDC_TASKBARPROP_HIDE, 13,58,200,10 AUTOCHECKBOX "&Zobrazit hlavnÃ panel nad ostatnÃmi okny", IDC_TASKBARPROP_ONTOP, 13,71,200,10 - AUTOCHECKBOX "&Seskupovat podobnÃ¡ tlaÃ¨Ãtka hlavnÃho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 - AUTOCHECKBOX "Zobrazit &panel SnadnÃ© spuÅ¡tÃ¬nÃ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 + AUTOCHECKBOX "&Seskupovat podobnÃ¡ tlaÄÃtka hlavnÃho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "Zobrazit &panel SnadnÃ© spuÅ¡tÄnÃ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Zobrazit &nÃ¡hledy oken", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 END @@ -81,14 +81,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN AUTORADIOBUTTON "Start &menu", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 - LTEXT "Tento styl menu umoÅ¾Ã²uje snadnÃ½ pÃ¸Ãstup ke sloÅ¾kÃ¡m, oblÃbenÃ½m programÃ¹m a vyhledÃ¡vÃ¡nÃ.", IDC_STATIC, 20,17,150,24, WS_DISABLED + LTEXT "Tento styl menu umoÅ¾Åuje snadnÃ½ pÅÃstup ke sloÅ¾kÃ¡m, oblÃbenÃ½m programÅ¯m a vyhledÃ¡vÃ¡nÃ.", IDC_STATIC, 20,17,150,24, WS_DISABLED PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED AUTORADIOBUTTON "&KlasickÃ© Start menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED - LTEXT "Tento styl menu umoÅ¾Ã²uje pouÅ¾Ãvat klasickÃ½ vzhled a funkce",-1,20,57,150,24, WS_DISABLED + LTEXT "Tento styl menu umoÅ¾Åuje pouÅ¾Ãvat klasickÃ½ vzhled a funkce",-1,20,57,150,24, WS_DISABLED PUSHBUTTON "Up&ravit...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED GROUPBOX "SoukromÃ",IDC_STATIC, 7,100,238,42 - AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy otevÃ¸enÃ½ch &souborÃ¹", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED - AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy spuÅ¡tÃ¬nÃ½ch &programÃ¹",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED + AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy otevÅenÃ½ch &souborÅ¯", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "UloÅ¾it a zobrazit seznam naposledy spuÅ¡tÄnÃ½ch &programÅ¯",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 @@ -98,24 +98,24 @@ BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED GROUPBOX "Ikony", IDC_STATIC, 6,33,240,58, WS_DISABLED - LTEXT "PÃ¸ehledost oznamovacÃ oblasti lze zachovat pomocÃ skrytÃ nepouÅ¾ÃvanÃ½ch ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED + LTEXT "PÅehledost oznamovacÃ oblasti lze zachovat pomocÃ skrytÃ nepouÅ¾ÃvanÃ½ch ikon.", IDC_STATIC, 13,48,223,16, WS_DISABLED AUTOCHECKBOX "Sk&rÃ½t neaktivnÃ ikony", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED GROUPBOX "SystÃ©movÃ© ikony", IDC_STATIC, 6,97,240,84, WS_DISABLED LTEXT "Vyberte systÃ©movÃ© ikony, kterÃ© se majÃ vÅ¾dy zobrazit.", IDC_STATIC, 13,112,223,16, WS_DISABLED AUTOCHECKBOX "&Hodiny", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED AUTOCHECKBOX "H&lasitost", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED - AUTOCHECKBOX "S&ÃÂ", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "S&ÃÅ¥", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED AUTOCHECKBOX "&NapÃ¡jenÃ", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Panely nÃ¡strojÃ¹" +CAPTION "Panely nÃ¡strojÅ¯" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Vyberte panely nÃ¡strojÃ¹, kterÃ© majÃ bÃ½t pÃ¸ÃdÃ¡ny na hlavnÃ panel.", IDC_STATIC, 7,7,223,12, WS_DISABLED + LTEXT "Vyberte panely nÃ¡strojÅ¯, kterÃ© majÃ bÃ½t pÅÃdÃ¡ny na hlavnÃ panel.", IDC_STATIC, 7,7,223,12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END @@ -124,7 +124,7 @@ BEGIN IDS_START "Start" IDS_PROPERTIES "Vl&astnosti" - IDS_OPEN_ALL_USERS "Ote&vÃ¸Ãt sloÅ¾ku All Users" + IDS_OPEN_ALL_USERS "Ote&vÅÃt sloÅ¾ku All Users" IDS_EXPLORE_ALL_USERS "Pro&chÃ¡zet sloÅ¾ku All Users" IDS_STARTUP_ERROR "SystÃ©m nemohl spustit proces Explorer, protoÅ¾e registry jsou poÅ¡kozenÃ© nebo nedostupnÃ©." END Modified: trunk/reactos/base/system/format/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/cs… ============================================================================== --- trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,21 +7,21 @@ STRINGTABLE DISCARDABLE BEGIN STRING_HELP, "PouÅ¾itÃ: %s jednotka: [-FS:filesystem] [-V:jmenovka] [-Q] [-A:velikost] [-C]\n\n\ - [jednotka:] UrÃ¨Ã jednotku, kterÃ¡ bude zformÃ¡tovÃ¡na.\n\ - -FS:typfs UrÃ¨Ã typ souborovÃ©ho systÃ©mu (%s).\n\ - -V:jmenovka UrÃ¨Ã jmenovku svazku.\n\ + [jednotka:] UrÄÃ jednotku, kterÃ¡ bude zformÃ¡tovÃ¡na.\n\ + -FS:typfs UrÄÃ typ souborovÃ©ho systÃ©mu (%s).\n\ + -V:jmenovka UrÄÃ jmenovku svazku.\n\ -Q Provede rychlÃ© formÃ¡tovÃ¡nÃ.\n\ - -A:velikost PÃ¸epÃÅ¡e implicitnÃ velikost alokaÃ¨nÃ jednotky. Pro bÃ¬Å¾nÃ©\n\ - pouÅ¾itÃ silnÃ¬ doporuÃ¨ujeme implicitnÃ hodnoty.\n\ + -A:velikost PÅepÃÅ¡e implicitnÃ velikost alokaÄnÃ jednotky. Pro bÄÅ¾nÃ©\n\ + pouÅ¾itÃ silnÄ doporuÄujeme implicitnÃ hodnoty.\n\ NTFS podporuje 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT podporuje 8192, 16K, 32K, 64K, 128K, 256K.\n\ - Pro alokaÃ¨nÃ jednotky pÃ¸es 4096 nenÃ podporovÃ¡na NTFS komprese.\n\ - -C Soubory vytvoÃ¸enÃ© na novÃ©m svazku budou implicitnÃ¬\n\ + Pro alokaÄnÃ jednotky pÅes 4096 nenÃ podporovÃ¡na NTFS komprese.\n\ + -C Soubory vytvoÅenÃ© na novÃ©m svazku budou implicitnÄ\n\ komprimovÃ¡ny.\n\n" -STRING_COMPLETE "%lu procent dokonÃ¨eno.\r" +STRING_COMPLETE "%lu procent dokonÄeno.\r" -STRING_FORMAT_FAIL "FormatEx nedokÃ¡zal ÃºspÃ¬Å¡nÃ¬ skonÃ¨it.\n\n" +STRING_FORMAT_FAIL "FormatEx nedokÃ¡zal ÃºspÄÅ¡nÄ skonÄit.\n\n" STRING_NO_SUPPORT "Operace nenÃ podporovÃ¡na" @@ -33,7 +33,7 @@ STRING_ERROR_DRIVE_TYPE "Nelze zjistit typ disku" -STRING_INSERT_DISK "VloÅ¾te novou disketu do jednotky %C:\na potÃ© stisknÃ¬te klÃ¡vesu ENTER..." +STRING_INSERT_DISK "VloÅ¾te novou disketu do jednotky %C:\na potÃ© stisknÄte klÃ¡vesu ENTER..." STRING_NO_VOLUME "Nelze zjistit svazek" @@ -41,30 +41,30 @@ STRING_FILESYSTEM "SouborovÃ½ systÃ©m je typu %s.\n" -STRING_LABEL_NAME_EDIT "VloÅ¾te nynÃ¬jÅ¡Ã jmenovku svazku pro jednotku %C: " +STRING_LABEL_NAME_EDIT "VloÅ¾te nynÄjÅ¡Ã jmenovku svazku pro jednotku %C: " STRING_ERROR_LABEL "Pro tuto jednotku byla zadÃ¡na nesprÃ¡vnÃ¡ jmenovka svazku.\n" STRING_YN_FORMAT "\nPOZOR, VÅ ECHNA DATA NA PEVNÃM DISKU\n\ -NA JEDNOTCE %C: BUDOU ZTRACENA!\nPokroÃ¨it k formÃ¡tovÃ¡nÃ (A/N)? " +NA JEDNOTCE %C: BUDOU ZTRACENA!\nPokroÄit k formÃ¡tovÃ¡nÃ (A/N)? " STRING_YES_NO_FAQ "AN" -STRING_VERIFYING "OvÃ¬Ã¸uji" +STRING_VERIFYING "OvÄÅuji" STRING_FAST_FMT "RychloformÃ¡tovÃ¡nÃ" -STRING_CREATE_FSYS "VytvÃ¡Ã¸Ãm strukturu souborovÃ©ho systÃ©mu.\n" +STRING_CREATE_FSYS "VytvÃ¡ÅÃm strukturu souborovÃ©ho systÃ©mu.\n" -STRING_FMT_COMPLETE "FormÃ¡tovÃ¡nÃ dokonÃ¨eno.\n" +STRING_FMT_COMPLETE "FormÃ¡tovÃ¡nÃ dokonÄeno.\n" STRING_VOL_COMPRESS "Svazek nepodporuje kompresi.\n" -STRING_ENTER_LABEL "Jmenovka svazku (11 znakÃ¹, ENTER pro Å¾Ã¡dnÃ½)? " +STRING_ENTER_LABEL "Jmenovka svazku (11 znakÅ¯, ENTER pro Å¾Ã¡dnÃ½)? " STRING_NO_LABEL "Nelze nastavit jmenovku svazku" -STRING_FREE_SPACE "\nCelkovÃ© mÃsto na disku: %I64d bajtÃ¹.\nDostupnÃ© mÃsto: %I64d bajtÃ¹.\n" +STRING_FREE_SPACE "\nCelkovÃ© mÃsto na disku: %I64d bajtÅ¯.\nDostupnÃ© mÃsto: %I64d bajtÅ¯.\n" -STRING_SERIAL_NUMBER "\nSÃ©riovÃ© Ã¨Ãslo svazku je %04X-%04X\n" +STRING_SERIAL_NUMBER "\nSÃ©riovÃ© ÄÃslo svazku je %04X-%04X\n" END Modified: trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,25 +7,25 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_UsageMessage, "%s\n\nPouÅ¾itÃ: regsvr32 [/u] [/s] [/c] [/n] [/i[:pÃ¸Ãkaz]] nÃ¡zevdll\n\ +IDS_UsageMessage, "%s\n\nPouÅ¾itÃ: regsvr32 [/u] [/s] [/c] [/n] [/i[:pÅÃkaz]] nÃ¡zevdll\n\ /u - Odregistrovat server\n\ /s - TichÃ½ reÅ¾im; nezobrazuje Å¾Ã¡dnÃ© zprÃ¡vy\n\ /c - VÃ½stup na konzoli\n\ -/i - Zavolat DllInstall a pÃ¸edat volitelnÃ½ [pÃ¸Ãkaz]; pÃ¸i pouÅ¾itÃ s /u volÃ¡ odinstalaci dll\n\ +/i - Zavolat DllInstall a pÅedat volitelnÃ½ [pÅÃkaz]; pÅi pouÅ¾itÃ s /u volÃ¡ odinstalaci dll\n\ /n - Nevolat DllRegisterServer; tato volba musÃ bÃ½t pouÅ¾ita s /i" IDS_NoDllSpecified, "Nebyl zadÃ¡n nÃ¡zev DLL." -IDS_InvalidFlag, "NerozpoznanÃ½ pÃ¸epÃnaÃ¨: %s" +IDS_InvalidFlag, "NerozpoznanÃ½ pÅepÃnaÄ: %s" -IDS_SwitchN_NoI, "NerozpoznanÃ½ pÃ¸epÃnaÃ¨: /n musÃ bÃ½t pouÅ¾ito s pÃ¸epÃnaÃ¨em /i" +IDS_SwitchN_NoI, "NerozpoznanÃ½ pÅepÃnaÄ: /n musÃ bÃ½t pouÅ¾ito s pÅepÃnaÄem /i" IDS_DllNotLoaded, "LoadLibrary('%s') selhalo.\nGetLastError vracÃ 0x%08x." -IDS_MissingEntry, "%s bylo naÃ¨teno, ale vstupnÃ bod %s nebyl nalezen.\n\n\ -%s nemusÃ bÃ½t vyexportovÃ¡no, nebo v pamÃ¬ti mÃ¹Å¾e bÃ½t poÅ¡kozenÃ¡ verze %s. ZvaÅ¾te pouÅ¾itÃ PView k nalezenÃ a odstranÃ¬nÃ." +IDS_MissingEntry, "%s bylo naÄteno, ale vstupnÃ bod %s nebyl nalezen.\n\n\ +%s nemusÃ bÃ½t vyexportovÃ¡no, nebo v pamÄti mÅ¯Å¾e bÃ½t poÅ¡kozenÃ¡ verze %s. ZvaÅ¾te pouÅ¾itÃ PView k nalezenÃ a odstranÄnÃ." IDS_FailureMessage, "%s v %s selhalo.\nNÃ¡vratovÃ½ kÃ³d je: 0x%08x" -IDS_SuccessMessage, "%s v %s uspÃ¬lo." +IDS_SuccessMessage "%s v %s uspÄlo." END Modified: trunk/reactos/base/system/rundll32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -6,6 +6,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_DllNotLoaded, "LoadLibrary se nepodaÃ¸ilo naÃ¨Ãst '%s'" + IDS_DllNotLoaded, "LoadLibrary se nepodaÅilo naÄÃst '%s'" IDS_MissingEntry, "ChybÃ vstupnÃ bod:%s\nV %s" END Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -7,6 +7,6 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_USERINIT_FAIL, "Aplikace Userinit selhala pÃ¸i spouÅ¡tÃ¬nÃ shellu!\n" +STRING_USERINIT_FAIL, "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho rozhranÃ!\n" END Modified: trunk/reactos/base/system/winlogon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/cs-CZ.rc [iso-8859-1] Sun Nov 13 16:27:03 2011 @@ -2,10 +2,10 @@ IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "VypnutÃ poÃ¨ÃtaÃ¨e" +CAPTION "VypnutÃ poÄÃtaÄe" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "NynÃ mÃ¹Å¾ete bez obav vypnout VÃ¡Å¡ poÃ¨ÃtaÃ¨.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "NynÃ mÅ¯Å¾ete VÃ¡Å¡ poÄÃtaÄ bez obav vypnout.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END @@ -15,31 +15,31 @@ CAPTION "Chyba uÅ¾ivatelskÃ©ho rozhranÃ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "DynamickÃ¡ knihovna %s selhala pÃ¸i nahrÃ¡vanÃ.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontaktujte sprÃ¡vce poÃ¨ÃtaÃ¨e pro nahrazenÃ dynamickÃ¬ knihovny nebo obnovte pÃ¹vodnÃ dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "DynamickÃ¡ knihovna %s selhala pÅi nahrÃ¡vanÃ.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontaktujte sprÃ¡vce poÄÃtaÄe pro nahrazenÃ dynamickÄ knihovny nebo obnovte pÅ¯vodnÃ dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "PÃ¸Ãprava sÃÂovÃ½ch pÃ¸ipojenÃ..." - IDS_APPLYINGCOMPUTERSETTINGS "NastavenÃ poÃ¨ÃtaÃ¨e..." - IDS_RUNNINGSTARTUPSCRIPTS "SpouÅ¡tÃ¬cÃ skripty..." - IDS_RUNNINGSHUTDOWNSCRIPTS "UkonÃ¨ovacÃ skripty..." + IDS_PREPARENETWORKCONNECTIONS "PÅÃprava sÃÅ¥ovÃ½ch pÅipojenÃ..." + IDS_APPLYINGCOMPUTERSETTINGS "NastavenÃ poÄÃtaÄe..." + IDS_RUNNINGSTARTUPSCRIPTS "SpouÅ¡tÄcÃ skripty..." + IDS_RUNNINGSHUTDOWNSCRIPTS "UkonÄovacÃ skripty..." IDS_APPLYINGYOURPERSONALSETTINGS "OsobnÃ nastavenÃ..." IDS_RUNNINGLOGOFFSCRIPTS "Skripty po odhlÃ¡Å¡enÃ..." - IDS_RUNNINGLOGONSCRIPTS "Skripty po pÃ¸ihlÃ¡Å¡enÃ..." + IDS_RUNNINGLOGONSCRIPTS "Skripty po pÅihlÃ¡Å¡enÃ..." IDS_LOADINGYOURPERSONALSETTINGS "NahrÃ¡vÃ¡nÃ osobnÃho nastavenÃ..." - IDS_CLOSINGNETWORKCONNECTIONS "UkonÃ¨enÃ sÃÂovÃ½ch pÃ¸ipojenÃ..." + IDS_CLOSINGNETWORKCONNECTIONS "UkonÄenÃ sÃÅ¥ovÃ½ch pÅipojenÃ..." IDS_REACTOSISSHUTTINGDOWN "ReactOS se vypÃnÃ¡..." - IDS_PREPARETOSTANDBY "PÃ¸Ãprava k pÃ¸echodu do ÃºspornÃ©ho reÅ¾imu..." - IDS_PREPARETOHIBERNATE "PÃ¸Ãprava k pÃ¸echodu do reÅ¾imu hibernace..." + IDS_PREPARETOSTANDBY "PÅÃprava k pÅechodu do ÃºspornÃ©ho reÅ¾imu..." + IDS_PREPARETOHIBERNATE "PÅÃprava k pÅechodu do reÅ¾imu hibernace..." IDS_SAVEYOURSETTINGS "UklÃ¡dÃ¡nÃ osobnÃho nastavenÃ..." IDS_REACTOSISSTARTINGUP "ReactOS se spouÅ¡tÃ..." END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala pÃ¸i aktivaci shellu!" + IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala pÅi aktivaci uÅ¾ivatelskÃ©ho rozhranÃ!" END

1 0

[ekohl] 54373: [SERVICES] REnumServicesStatusExW: Fix dwServiceType and dwServiceState checks.
by ekohl＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: ekohl Date: Sun Nov 13 12:13:16 2011 New Revision: 54373 URL: http://svn.reactos.org/svn/reactos?rev=54373&view=rev Log: [SERVICES] REnumServicesStatusExW: Fix dwServiceType and dwServiceState checks. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 13 12:13:16 2011 @@ -5304,13 +5304,16 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + if ((dwServiceType == 0) || + ((dwServiceType & ~(SERVICE_DRIVER | SERVICE_WIN32)) != 0)) { DPRINT("Not a valid Service Type!\n"); return ERROR_INVALID_PARAMETER; } - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + if ((dwServiceState != SERVICE_ACTIVE) && + (dwServiceState != SERVICE_INACTIVE) && + (dwServiceState != SERVICE_STATE_ALL)) { DPRINT("Not a valid Service State!\n"); return ERROR_INVALID_PARAMETER;

1 0

[cgutman] 54372: [NDIS] - Fix a critical bug in NdisMGetDmaAlignment which was causing every NIC driver calling this function to crash because we thought we were passed an NDIS_DMA_BLOCK handle whe...
by cgutman＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: cgutman Date: Sun Nov 13 06:02:08 2011 New Revision: 54372 URL: http://svn.reactos.org/svn/reactos?rev=54372&view=rev Log: [NDIS] - Fix a critical bug in NdisMGetDmaAlignment which was causing every NIC driver calling this function to crash because we thought we were passed an NDIS_DMA_BLOCK handle when in fact we receive an NDIS_MINIPORT_BLOCK handle - Fixes RTL8169 and 3Com NICs (and probably several more) [bug 6651 and bug 4330] Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Nov 13 06:02:08 2011 @@ -831,6 +831,7 @@ NdisMReadDmaCounter( IN NDIS_HANDLE MiniportDmaHandle) { + /* NOTE: Unlike NdisMGetDmaAlignment() below, this is a handle to the DMA block */ PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; @@ -846,10 +847,11 @@ ULONG EXPORT NdisMGetDmaAlignment( - IN NDIS_HANDLE MiniportDmaHandle) -{ - PNDIS_DMA_BLOCK DmaBlock = MiniportDmaHandle; - PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)DmaBlock->SystemAdapterObject; + IN NDIS_HANDLE MiniportAdapterHandle) +{ + /* NOTE: Unlike NdisMReadDmaCounter() above, this is a handle to the NDIS miniport block */ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PDMA_ADAPTER AdapterObject = (PDMA_ADAPTER)Adapter->NdisMiniportBlock.SystemAdapterObject; NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));

1 0

[cgutman] 54371: [HAL] - Fix DMA on the EISA bus - Fix a critical calculation error in map register size resulting in the map register allocation worker not allocating enough map registers for a dy...
by cgutman＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: cgutman Date: Sun Nov 13 05:49:33 2011 New Revision: 54371 URL: http://svn.reactos.org/svn/reactos?rev=54371&view=rev Log: [HAL] - Fix DMA on the EISA bus - Fix a critical calculation error in map register size resulting in the map register allocation worker not allocating enough map registers for a dynamic resize Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sun Nov 13 05:49:33 2011 @@ -614,9 +614,12 @@ * Also note that we check for channel number since there are only 8 DMA * channels on ISA, so any request above this requires new adapter. */ - if ((DeviceDescription->InterfaceType == Isa) || !(DeviceDescription->Master)) - { - if ((DeviceDescription->InterfaceType == Isa) && (DeviceDescription->DmaChannel >= 8)) + if (((DeviceDescription->InterfaceType == Eisa) || + (DeviceDescription->InterfaceType == Isa)) || !(DeviceDescription->Master)) + { + if (((DeviceDescription->InterfaceType == Isa) || + (DeviceDescription->InterfaceType == Eisa)) && + (DeviceDescription->DmaChannel >= 8)) { EisaAdapter = FALSE; } @@ -1208,7 +1211,7 @@ */ KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL); Succeeded = HalpGrowMapBuffers(WorkItem->AdapterObject->MasterAdapter, - WorkItem->NumberOfMapRegisters); + WorkItem->NumberOfMapRegisters << PAGE_SHIFT); KeSetEvent(&HalpDmaLock, 0, 0); if (Succeeded)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs