Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 01/01: [ATL] Add atlsync.h (#4382)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd5a634611ca45ed14ed8… commit dd5a634611ca45ed14ed84ca9cf5a120537a8b90 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Mar 7 11:02:42 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 7 11:02:42 2022 +0900 [ATL] Add atlsync.h (#4382) - Add atlsync.h and implement CCriticalSection, CEvent, CMutex and CSemaphore classes. CORE-13950 --- sdk/lib/atl/atlsync.h | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/sdk/lib/atl/atlsync.h b/sdk/lib/atl/atlsync.h new file mode 100644 index 00000000000..5a72ca5a52c --- /dev/null +++ b/sdk/lib/atl/atlsync.h @@ -0,0 +1,201 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ATL Synchronization + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#pragma once + +#ifndef __ATLSYNC_H__ +#define __ATLSYNC_H__ + +#include "atlbase.h" + +namespace ATL +{ + +class CCriticalSection : public CRITICAL_SECTION +{ + CCriticalSection() + { + ::InitializeCriticalSection(this); + } + + ~CCriticalSection() + { + ::DeleteCriticalSection(this); + } + + void Enter() + { + ::EnterCriticalSection(this); + } + + void Leave() + { + ::LeaveCriticalSection(this); + } + + BOOL TryEnter() + { + return ::TryEnterCriticalSection(this); + } +}; + +class CEvent : public CHandle +{ + CEvent() + { + } + + CEvent(CEvent& hEvent) : CHandle(hEvent) + { + } + + CEvent(BOOL bManualReset, BOOL bInitialState) + { + Create(NULL, bManualReset, bInitialState, NULL); + } + + CEvent(LPSECURITY_ATTRIBUTES pSecurity, BOOL bManualReset, BOOL bInitialState, LPCTSTR pszName) + { + Create(pSecurity, bManualReset, bInitialState, pszName); + } + + explicit CEvent(HANDLE hEvent) : CHandle(hEvent) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, BOOL bManualReset, BOOL bInitialState, LPCTSTR pszName) + { + HANDLE hEvent = ::CreateEvent(pSecurity, bManualReset, bInitialState, pszName); + ATLASSERT(hEvent != NULL); + Attach(hEvent); + return hEvent != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hEvent = ::OpenEvent(dwAccess, bInheritHandle, pszName); + ATLASSERT(hEvent != NULL); + Attach(hEvent); + return hEvent != NULL; + } + + BOOL Set() + { + ATLASSERT(*this); + return ::SetEvent(*this); + } + + BOOL Reset() + { + ATLASSERT(*this); + return ::ResetEvent(*this); + } + + BOOL Pulse() + { + ATLASSERT(*this); + return ::PulseEvent(*this); + } +}; + +class CMutex : public CHandle +{ + CMutex() + { + } + + CMutex(CMutex& hMutex) : CHandle(hMutex) + { + } + + explicit CMutex(BOOL bInitialOwner) + { + Create(NULL, bInitialOwner, NULL); + } + + CMutex(LPSECURITY_ATTRIBUTES pSecurity, BOOL bInitialOwner, LPCTSTR pszName) + { + Create(pSecurity, bInitialOwner, pszName); + } + + explicit CMutex(HANDLE hMutex) : CHandle(hMutex) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, BOOL bInitialOwner, LPCTSTR pszName) + { + HANDLE hMutex = ::CreateMutex(pSecurity, bInitialOwner, pszName); + ATLASSERT(hMutex != NULL); + Attach(hMutex); + return hMutex != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hMutex = ::OpenMutex(dwAccess, bInheritHandle, pszName); + ATLASSERT(hMutex != NULL); + Attach(hMutex); + return hMutex != NULL; + } + + BOOL Release() + { + ATLASSERT(*this); + return ::ReleaseMutex(*this); + } +}; + +class CSemaphore : public CHandle +{ + CSemaphore() + { + } + + CSemaphore(CSemaphore& hSemaphore) : CHandle(hSemaphore) + { + } + + CSemaphore(LONG nInitialCount, LONG nMaxCount) + { + Create(NULL, nInitialCount, nMaxCount, NULL); + } + + CSemaphore(LPSECURITY_ATTRIBUTES pSecurity, LONG nInitialCount, LONG nMaxCount, LPCTSTR pszName) + { + Create(pSecurity, nInitialCount, nMaxCount, pszName); + } + + explicit CSemaphore(HANDLE hSemaphore) : CHandle(hSemaphore) + { + } + + BOOL Create(LPSECURITY_ATTRIBUTES pSecurity, LONG nInitialCount, LONG nMaxCount, LPCTSTR pszName) + { + HANDLE hSemaphore = ::CreateSemaphore(pSecurity, nInitialCount, nMaxCount, pszName); + ATLASSERT(hSemaphore != NULL); + Attach(hSemaphore); + return hSemaphore != NULL; + } + + BOOL Open(DWORD dwAccess, BOOL bInheritHandle, LPCTSTR pszName) + { + HANDLE hSemaphore = ::OpenSemaphore(dwAccess, bInheritHandle, pszName); + ATLASSERT(hSemaphore != NULL); + Attach(hSemaphore); + return hSemaphore != NULL; + } + + BOOL Release(LONG nReleaseCount = 1, LPLONG pnOldCount = NULL) + { + ATLASSERT(*this); + return ::ReleaseSemaphore(*this, nReleaseCount, pnOldCount); + } +}; + +} // namespace ATL + +#endif // __ATLSYNC_H__

2 years, 6 months

[reactos] 01/01: [SHELL32] Support CSIDL_FLAG_NO_ALIAS (#4381)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cb1e57a630e09ba90a3e… commit 6cb1e57a630e09ba90a3e0c292beaf5754e0b7de Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 6 15:25:45 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 6 15:25:45 2022 +0900 [SHELL32] Support CSIDL_FLAG_NO_ALIAS (#4381) Adding the CSIDL_FLAG_NO_ALIAS flag to SHGetSpecialFolderLocation should return the physical PIDL if possible. CORE-18079 --- dll/win32/shell32/wine/shellpath.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 736092b20a5..70409260e69 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -2888,6 +2888,9 @@ HRESULT WINAPI SHGetFolderLocation( LPITEMIDLIST *ppidl) { HRESULT hr = E_INVALIDARG; +#ifdef __REACTOS__ + WCHAR szPath[MAX_PATH]; +#endif TRACE("%p 0x%08x %p 0x%08x %p\n", hwndOwner, nFolder, hToken, dwReserved, ppidl); @@ -2897,6 +2900,15 @@ HRESULT WINAPI SHGetFolderLocation( if (dwReserved) return E_INVALIDARG; +#ifdef __REACTOS__ + if ((nFolder & CSIDL_FLAG_NO_ALIAS) && + SHGetSpecialFolderPathW(hwndOwner, szPath, (nFolder & CSIDL_FOLDER_MASK), FALSE)) + { + *ppidl = ILCreateFromPathW(szPath); + if (*ppidl) + return S_OK; + } +#endif /* The virtual folders' locations are not user-dependent */ *ppidl = NULL; switch (nFolder & CSIDL_FOLDER_MASK)

2 years, 6 months

[reactos] 01/01: [SHELL32] Follow-up of 'Simplify CChangeNotifyServer'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5f6e744e7bfdadd38c2d… commit c5f6e744e7bfdadd38c2de41b12d595651c0af95 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 6 12:33:10 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 6 12:33:10 2022 +0900 [SHELL32] Follow-up of 'Simplify CChangeNotifyServer' Do DestroyAllItems() on OnDestroy(). CORE-13950 --- dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index b4a46d35e8d..bb6d531ec9f 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -79,6 +79,7 @@ private: BOOL RemoveItemsByRegID(UINT nRegID); BOOL RemoveItemsByProcess(DWORD dwUserPID); void DestroyItem(CWatchItem *pItem, HWND *phwndBroker); + void DestroyAllItems(); UINT GetNextRegID(); BOOL DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID); @@ -136,6 +137,20 @@ void CChangeNotifyServer::DestroyItem(CWatchItem *pItem, HWND *phwndBroker) delete pItem; } +void CChangeNotifyServer::DestroyAllItems() +{ + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i]) + { + HWND hwndBroker = NULL; + DestroyItem(m_items[i], &hwndBroker); + m_items[i] = NULL; + } + } + m_items.RemoveAll(); +} + BOOL CChangeNotifyServer::RemoveItemsByRegID(UINT nRegID) { BOOL bFound = FALSE; @@ -319,6 +334,7 @@ LRESULT CChangeNotifyServer::OnRemoveByPID(UINT uMsg, WPARAM wParam, LPARAM lPar LRESULT CChangeNotifyServer::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + DestroyAllItems(); CDirectoryWatcher::RequestAllWatchersTermination(); return 0; }

2 years, 6 months

[reactos] 01/01: [SHELL32] Simplify CChangeNotifyServer

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08bd87924773ca591cf73… commit 08bd87924773ca591cf731a3a57de9360b42c219 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 6 11:49:28 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 6 11:49:28 2022 +0900 [SHELL32] Simplify CChangeNotifyServer - Rename ITEM as CWatchItem. - Change CWatchItem::hRegEntry to CWatchItem::pRegEntry. - Simplify code around CWatchItem. CWatchItem::hRegEntry was local to server, so we could change it to a pointer. CORE-13950 --- .../shell32/shelldesktop/CChangeNotifyServer.cpp | 99 +++++++++------------- 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index 55918cad656..b4a46d35e8d 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -14,11 +14,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); ////////////////////////////////////////////////////////////////////////////// // notification target item -struct ITEM +struct CWatchItem { UINT nRegID; // The registration ID. DWORD dwUserPID; // The user PID; that is the process ID of the target window. - HANDLE hRegEntry; // The registration entry. + LPREGENTRY pRegEntry; // The registration entry. HWND hwndBroker; // Client broker window (if any). CDirectoryWatcher *pDirWatch; // for filesystem notification }; @@ -73,13 +73,12 @@ public: private: UINT m_nNextRegID; - CSimpleArray<ITEM> m_items; + CSimpleArray<CWatchItem*> m_items; - BOOL AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, HWND hwndBroker, - CDirectoryWatcher *pDirWatch); - BOOL RemoveItemsByRegID(UINT nRegID, DWORD dwOwnerPID); - void RemoveItemsByProcess(DWORD dwOwnerPID, DWORD dwUserPID); - void DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndBroker); + BOOL AddItem(CWatchItem *pItem); + BOOL RemoveItemsByRegID(UINT nRegID); + BOOL RemoveItemsByProcess(DWORD dwUserPID); + void DestroyItem(CWatchItem *pItem, HWND *phwndBroker); UINT GetNextRegID(); BOOL DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID); @@ -95,35 +94,31 @@ CChangeNotifyServer::~CChangeNotifyServer() { } -BOOL CChangeNotifyServer::AddItem(UINT nRegID, DWORD dwUserPID, HANDLE hRegEntry, - HWND hwndBroker, CDirectoryWatcher *pDirWatch) +BOOL CChangeNotifyServer::AddItem(CWatchItem *pItem) { // find the empty room for (INT i = 0; i < m_items.GetSize(); ++i) { - if (m_items[i].nRegID == INVALID_REG_ID) + if (m_items[i] == NULL) { // found the room, populate it - m_items[i].nRegID = nRegID; - m_items[i].dwUserPID = dwUserPID; - m_items[i].hRegEntry = hRegEntry; - m_items[i].hwndBroker = hwndBroker; - m_items[i].pDirWatch = pDirWatch; + m_items[i] = pItem; return TRUE; } } // no empty room found - ITEM item = { nRegID, dwUserPID, hRegEntry, hwndBroker, pDirWatch }; - m_items.Add(item); + m_items.Add(pItem); return TRUE; } -void CChangeNotifyServer::DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndBroker) +void CChangeNotifyServer::DestroyItem(CWatchItem *pItem, HWND *phwndBroker) { + assert(pItem); + // destroy broker if any and if first time - HWND hwndBroker = item.hwndBroker; - item.hwndBroker = NULL; + HWND hwndBroker = pItem->hwndBroker; + pItem->hwndBroker = NULL; if (hwndBroker && hwndBroker != *phwndBroker) { ::DestroyWindow(hwndBroker); @@ -131,47 +126,48 @@ void CChangeNotifyServer::DestroyItem(ITEM& item, DWORD dwOwnerPID, HWND *phwndB } // request termination of pDirWatch if any - CDirectoryWatcher *pDirWatch = item.pDirWatch; - item.pDirWatch = NULL; + CDirectoryWatcher *pDirWatch = pItem->pDirWatch; + pItem->pDirWatch = NULL; if (pDirWatch) pDirWatch->RequestTermination(); // free - SHFreeShared(item.hRegEntry, dwOwnerPID); - item.nRegID = INVALID_REG_ID; - item.dwUserPID = 0; - item.hRegEntry = NULL; - item.hwndBroker = NULL; - item.pDirWatch = NULL; + SHFree(pItem->pRegEntry); + delete pItem; } -BOOL CChangeNotifyServer::RemoveItemsByRegID(UINT nRegID, DWORD dwOwnerPID) +BOOL CChangeNotifyServer::RemoveItemsByRegID(UINT nRegID) { BOOL bFound = FALSE; HWND hwndBroker = NULL; assert(nRegID != INVALID_REG_ID); for (INT i = 0; i < m_items.GetSize(); ++i) { - if (m_items[i].nRegID == nRegID) + if (m_items[i] && m_items[i]->nRegID == nRegID) { bFound = TRUE; - DestroyItem(m_items[i], dwOwnerPID, &hwndBroker); + DestroyItem(m_items[i], &hwndBroker); + m_items[i] = NULL; } } return bFound; } -void CChangeNotifyServer::RemoveItemsByProcess(DWORD dwOwnerPID, DWORD dwUserPID) +BOOL CChangeNotifyServer::RemoveItemsByProcess(DWORD dwUserPID) { + BOOL bFound = FALSE; HWND hwndBroker = NULL; assert(dwUserPID != 0); for (INT i = 0; i < m_items.GetSize(); ++i) { - if (m_items[i].dwUserPID == dwUserPID) + if (m_items[i] && m_items[i]->dwUserPID == dwUserPID) { - DestroyItem(m_items[i], dwOwnerPID, &hwndBroker); + bFound = TRUE; + DestroyItem(m_items[i], &hwndBroker); + m_items[i] = NULL; } } + return bFound; } // create a CDirectoryWatcher from a REGENTRY @@ -228,14 +224,15 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, HWND hwndBroker = pRegEntry->hwndBroker; // clone the registration entry - HANDLE hNewEntry = SHAllocShared(pRegEntry, pRegEntry->cbSize, dwOwnerPID); - if (hNewEntry == NULL) + LPREGENTRY pNewEntry = (LPREGENTRY)SHAlloc(pRegEntry->cbSize); + if (pNewEntry == NULL) { ERR("Out of memory\n"); pRegEntry->nRegID = INVALID_REG_ID; SHUnlockShared(pRegEntry); return FALSE; } + CopyMemory(pNewEntry, pRegEntry, pRegEntry->cbSize); // create a directory watch if necessary CDirectoryWatcher *pDirWatch = NULL; @@ -255,8 +252,9 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, // unlock the registry entry SHUnlockShared(pRegEntry); - // add an ITEM - return AddItem(m_nNextRegID, dwUserPID, hNewEntry, hwndBroker, pDirWatch); + // add an item + CWatchItem *pItem = new CWatchItem { m_nNextRegID, dwUserPID, pNewEntry, hwndBroker, pDirWatch }; + return AddItem(pItem); } // Message CN_UNREGISTER: Unregister registration entries. @@ -276,9 +274,7 @@ LRESULT CChangeNotifyServer::OnUnRegister(UINT uMsg, WPARAM wParam, LPARAM lPara } // remove it - DWORD dwOwnerPID; - GetWindowThreadProcessId(m_hWnd, &dwOwnerPID); - return RemoveItemsByRegID(nRegID, dwOwnerPID); + return RemoveItemsByRegID(nRegID); } // Message CN_DELIVER_NOTIFICATION: Perform a delivery. @@ -316,9 +312,8 @@ LRESULT CChangeNotifyServer::OnSuspendResume(UINT uMsg, WPARAM wParam, LPARAM lP // return: Zero. LRESULT CChangeNotifyServer::OnRemoveByPID(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DWORD dwOwnerPID, dwUserPID = (DWORD)wParam; - GetWindowThreadProcessId(m_hWnd, &dwOwnerPID); - RemoveItemsByProcess(dwOwnerPID, dwUserPID); + DWORD dwUserPID = (DWORD)wParam; + RemoveItemsByProcess(dwUserPID); return 0; } @@ -355,20 +350,13 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) // for all items for (INT i = 0; i < m_items.GetSize(); ++i) { - // validate the item - if (m_items[i].nRegID == INVALID_REG_ID) + if (m_items[i] == NULL) continue; - HANDLE hRegEntry = m_items[i].hRegEntry; - if (hRegEntry == NULL) - continue; - - // lock the registration entry - LPREGENTRY pRegEntry = (LPREGENTRY)SHLockSharedEx(hRegEntry, dwOwnerPID, FALSE); + LPREGENTRY pRegEntry = m_items[i]->pRegEntry; if (pRegEntry == NULL || pRegEntry->dwMagic != REGENTRY_MAGIC) { ERR("pRegEntry is invalid\n"); - SHUnlockShared(pRegEntry); continue; } @@ -382,9 +370,6 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) SendMessageW(pRegEntry->hwnd, pRegEntry->uMsg, (WPARAM)hTicket, dwOwnerPID); TRACE("GetLastError(): %ld\n", ::GetLastError()); } - - // unlock the registration entry - SHUnlockShared(pRegEntry); } // unlock the ticket

2 years, 6 months

[reactos] 01/01: [TASKMGR] Add version resource info (#4376)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79eb14deb58646a48c63f… commit 79eb14deb58646a48c63fb4462abfd50e908ce40 Author: Thamatip Chitpong <weedgamer131(a)gmail.com> AuthorDate: Sun Mar 6 05:06:58 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 6 01:06:58 2022 +0300 [TASKMGR] Add version resource info (#4376) --- base/applications/taskmgr/taskmgr.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/applications/taskmgr/taskmgr.rc b/base/applications/taskmgr/taskmgr.rc index f9bd019941b..b23bc2fdc56 100644 --- a/base/applications/taskmgr/taskmgr.rc +++ b/base/applications/taskmgr/taskmgr.rc @@ -4,6 +4,11 @@ #include "resource.h" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Task Manager" +#define REACTOS_STR_INTERNAL_NAME "taskmgr" +#define REACTOS_STR_ORIGINAL_FILENAME "taskmgr.exe" +#include <reactos/version.rc> + IDI_TASKMANAGER ICON "res/taskmgr.ico" IDI_WINDOW ICON "res/window.ico" IDI_WINDOWSM ICON "res/windowsm.ico"

2 years, 6 months

[reactos] 01/01: [AC97] Improve driver version info (#4368)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ca32a2b95fb51a844ef8… commit 9ca32a2b95fb51a844ef83db0702a8b618f07e5b Author: Thamatip Chitpong <weedgamer131(a)gmail.com> AuthorDate: Sun Mar 6 05:04:56 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 6 01:04:56 2022 +0300 [AC97] Improve driver version info (#4368) --- drivers/wdm/audio/drivers/ac97/ac97.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/wdm/audio/drivers/ac97/ac97.rc b/drivers/wdm/audio/drivers/ac97/ac97.rc index 87c817afc40..35ba270a152 100644 --- a/drivers/wdm/audio/drivers/ac97/ac97.rc +++ b/drivers/wdm/audio/drivers/ac97/ac97.rc @@ -13,9 +13,9 @@ #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_DRV_SOUND -#define VER_FILEDESCRIPTION_STR "Integrated Controller Hub Audio Driver (WDM)" -#define VER_INTERNALNAME_STR "ac97smpl.sys" -#define VER_ORIGINALFILENAME_STR "ac97smpl.sys" +#define VER_FILEDESCRIPTION_STR "AC'97 Audio Driver (WDM)" +#define VER_INTERNALNAME_STR "ac97" +#define VER_ORIGINALFILENAME_STR "ac97.sys" #define VER_LEGALCOPYRIGHT_YEARS "1998-2003" #define VER_LEGALCOPYRIGHT_STR "Copyright (c) Microsoft Corp." VER_LEGALCOPYRIGHT_YEARS

2 years, 6 months

[reactos] 01/01: [AC97] Enable on all Intel AC'97 audio controllers (#4366)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68e19a95d04d4effacecc… commit 68e19a95d04d4effacecc60708fbbc3afb232fbb Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sat Mar 5 23:04:22 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 6 01:04:22 2022 +0300 [AC97] Enable on all Intel AC'97 audio controllers (#4366) --- drivers/wdm/audio/drivers/ac97/ac97.inf | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/wdm/audio/drivers/ac97/ac97.inf b/drivers/wdm/audio/drivers/ac97/ac97.inf index abf1920b71c..8a08c65b9f3 100644 --- a/drivers/wdm/audio/drivers/ac97/ac97.inf +++ b/drivers/wdm/audio/drivers/ac97/ac97.inf @@ -47,30 +47,62 @@ ac97.inf=222 ExcludeFromSelect = * [Intel] +%ac97_440MX.DeviceDesc%=ac97, PCI\VEN_8086&DEV_7195 %ac97_AA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2415 %ac97_AB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2425 %ac97_BA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2445 +%ac97_CA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2485 +%ac97_DB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24C5 +%ac97_EB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24D5 +%ac97_FB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_266E +%ac97_GB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_27DE +%ac97_6300ESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_25A6 +%ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2698 ;; This section enables installing on x64 systems [Intel.NTAMD64] +%ac97_440MX.DeviceDesc%=ac97, PCI\VEN_8086&DEV_7195 %ac97_AA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2415 %ac97_AB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2425 %ac97_BA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2445 +%ac97_CA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2485 +%ac97_DB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24C5 +%ac97_EB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24D5 +%ac97_FB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_266E +%ac97_GB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_27DE +%ac97_6300ESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_25A6 +%ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2698 ;; This section enables installing on Itanium systems [Intel.NTIA64] +%ac97_440MX.DeviceDesc%=ac97, PCI\VEN_8086&DEV_7195 %ac97_AA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2415 %ac97_AB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2425 %ac97_BA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2445 +%ac97_CA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2485 +%ac97_DB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24C5 +%ac97_EB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24D5 +%ac97_FB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_266E +%ac97_GB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_27DE +%ac97_6300ESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_25A6 +%ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2698 ;; This section enables installing on ARM systems [Intel.NTARM] +%ac97_440MX.DeviceDesc%=ac97, PCI\VEN_8086&DEV_7195 %ac97_AA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2415 %ac97_AB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2425 %ac97_BA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2445 +%ac97_CA.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2485 +%ac97_DB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24C5 +%ac97_EB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_24D5 +%ac97_FB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_266E +%ac97_GB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_27DE +%ac97_6300ESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_25A6 +%ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2698 [DestinationDirs] ac97.CopyList=10,system32\drivers @@ -306,9 +338,17 @@ ProviderName="FooProviderName" MfgName="Intel" DiskDescription="AC'97 WDM Driver Disk" +ac97_440MX.DeviceDesc="Intel 82440MX AC'97 Audio Controller" ac97_AA.DeviceDesc="Intel 82801AA AC'97 Audio Controller" ac97_AB.DeviceDesc="Intel 82801AB AC'97 Audio Controller" ac97_BA.DeviceDesc="Intel 82801BA/BAM AC'97 Audio Controller" +ac97_CA.DeviceDesc="Intel 82801CA/CAM AC'97 Audio Controller" +ac97_DB.DeviceDesc="Intel 82801DB/DBL/DBM AC'97 Audio Controller" +ac97_EB.DeviceDesc="Intel 82801EB/ER AC'97 Audio Controller" +ac97_FB.DeviceDesc="Intel 82801FB/FBM/FR/FW/FRW AC'97 Audio Controller" +ac97_GB.DeviceDesc="Intel 82801GB/GR/GDH/GBM/GHM AC'97 Audio Controller" +ac97_6300ESB.DeviceDesc="Intel 6300ESB AC'97 Audio Controller" +ac97_63xxESB.DeviceDesc="Intel 631xESB/632xESB AC'97 Audio Controller" ac97.DeviceDesc="Intel 82801 AC'97 Audio Controller" ac97.Wave.szPname="AC'97 Sound Card" @@ -396,9 +436,17 @@ ProviderName="FooProviderName" MfgName="Intel" DiskDescription="Diskette für AC'97 WDM Treiberbeispiel" +ac97_440MX.DeviceDesc="Intel 82440MX AC'97 Audiocontroller" ac97_AA.DeviceDesc="Intel 82801AA AC'97 Audiocontroller" ac97_AB.DeviceDesc="Intel 82801AB AC'97 Audiocontroller" ac97_BA.DeviceDesc="Intel 82801BA/BAM AC'97 Audiocontroller" +ac97_CA.DeviceDesc="Intel 82801CA/CAM AC'97 Audiocontroller" +ac97_DB.DeviceDesc="Intel 82801DB/DBL/DBM AC'97 Audiocontroller" +ac97_EB.DeviceDesc="Intel 82801EB/ER AC'97 Audiocontroller" +ac97_FB.DeviceDesc="Intel 82801FB/FBM/FR/FW/FRW AC'97 Audiocontroller" +ac97_GB.DeviceDesc="Intel 82801GB/GR/GDH/GBM/GHM AC'97 Audiocontroller" +ac97_6300ESB.DeviceDesc="Intel 6300ESB AC'97 Audiocontroller" +ac97_63xxESB.DeviceDesc="Intel 631xESB/632xESB AC'97 Audiocontroller" ac97.DeviceDesc="Intel 82801 AC'97 Audiocontroller" ac97.Wave.szPname="AC'97 Musikkarte"

2 years, 6 months

[reactos] 01/01: [REACTOS] de-DE.rc in all modules: DIE! EINGABETASTE! DIE! CORE-18077

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3f4c11af13c86c23c615… commit c3f4c11af13c86c23c615ee8defee9061ea09c30 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Mar 5 21:25:30 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Mar 5 21:25:30 2022 +0100 [REACTOS] de-DE.rc in all modules: DIE! EINGABETASTE! DIE! CORE-18077 harmonize the mixed usage of EINGABETASTE and ENTER in favor of ENTER. Allows us even to omit a linebreak in the format utility and therefore get closer to en-US.rc --- base/applications/cmdutils/label/lang/de-DE.rc | 2 +- base/applications/cmdutils/xcopy/lang/de-DE.rc | 2 +- base/shell/cmd/lang/de-DE.rc | 4 ++-- base/system/format/lang/de-DE.rc | 4 ++-- modules/rosapps/applications/winfile/lang/de-DE.rc | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/cmdutils/label/lang/de-DE.rc b/base/applications/cmdutils/label/lang/de-DE.rc index 128b366d645..52f5bc561b5 100644 --- a/base/applications/cmdutils/label/lang/de-DE.rc +++ b/base/applications/cmdutils/label/lang/de-DE.rc @@ -11,7 +11,7 @@ LABEL [Laufwerk:][Bezeichnung]\n\n\ STRING_LABEL_TEXT1 "Volume in Laufwerk %c: ist %s\n" STRING_LABEL_TEXT2 "Volume in Laufwerk %c: hat keine Bezeichnung\n" STRING_LABEL_TEXT3 "Volumenummer: %04X-%04X\n" - STRING_LABEL_TEXT4 "Volumebezeichnung (32 Zeichen, EINGABETASTE für keine)? " + STRING_LABEL_TEXT4 "Volumebezeichnung (32 Zeichen, ENTER für keine)? " STRING_LABEL_PROMPT "Aktuelle Volumebezeichnung löschen (J/N)? " STRING_LABEL_OPTIONS "JN" STRING_ERROR_INVALID_DRIVE "Ungültige Laufwerksangaben\n" diff --git a/base/applications/cmdutils/xcopy/lang/de-DE.rc b/base/applications/cmdutils/xcopy/lang/de-DE.rc index 05dc76719ac..6840d400302 100644 --- a/base/applications/cmdutils/xcopy/lang/de-DE.rc +++ b/base/applications/cmdutils/xcopy/lang/de-DE.rc @@ -4,7 +4,7 @@ STRINGTABLE { STRING_INVPARMS, "Falsche Parameteranzahl - xcopy /? zeigt Hilfe an\n" STRING_INVPARM, "Unbekannter Parameter '%1' - xcopy /? zeigt Hilfe an\n" - STRING_PAUSE, "Eingabetaste betätigen, um mit dem Kopieren zu beginnen\n" + STRING_PAUSE, "ENTER betätigen, um mit dem Kopieren zu beginnen\n" STRING_SIMCOPY, "%1!d! Datei(en) würden kopiert\n" STRING_COPY, "%1!d! Datei(en) kopiert\n" STRING_QISDIR, "Ist '%1' eine Datei oder ein Verzeichnis\n\ diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 66459462049..0ca0a488ffb 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -112,7 +112,7 @@ device." DATE [/T][Datum]\n\n\ /T nur Datum anzeigen\n\n\ Der Befehl DATE ohne Parameter zeigt das aktuelle Datum an und fragt nach\n\ -einem neuen. Drücken Sie die EINGABETASTE, um das bisherige Datum zu behalten." +einem neuen. Drücken Sie ENTER, um das bisherige Datum zu behalten." STRING_DEL_HELP1 "Löscht eine oder mehrere Dateien.\n\n\ DEL [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ DELETE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ @@ -393,7 +393,7 @@ TITLE [Zeichenfolge]\n\n\ TIME [/T][Zeit]\n\n\ /T nur anzeigen\n\n\ TIME ohne Parameter zeigt die aktuelle Systemzeit an und fragt nach der neuen\n\ -Uhrzeit. Drücken Sie die EINGABETASTE, um die bisherige Zeit beizubehalten." +Uhrzeit. Drücken Sie ENTER, um die bisherige Zeit beizubehalten." STRING_TIME_HELP2 "Geben Sie eine neue Zeit ein: " STRING_TIMER_HELP1 "Verstrichene %d Millisekunden\n" STRING_TIMER_HELP2 "Verstrichene %02d%c%02d%c%02d%c%02d\n" diff --git a/base/system/format/lang/de-DE.rc b/base/system/format/lang/de-DE.rc index 9cb19e3ef38..22e102984ba 100644 --- a/base/system/format/lang/de-DE.rc +++ b/base/system/format/lang/de-DE.rc @@ -22,7 +22,7 @@ BEGIN STRING_UNKNOW_ARG "Unbekanntes Argument: %s\n" STRING_DRIVE_PARM "Benötigter Laufwerksparameter fehlt.\n\n" STRING_ERROR_DRIVE_TYPE "Konnte den Laufwerkstyp nicht erhalten" - STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund betätigen Sie die Eingabetaste, wenn das Laufwerk\nbereit ist." + STRING_INSERT_DISK "Legen Sie eine neue Diskette in Laufwerk %C: ein\nund drücken Sie ENTER, wenn das Laufwerk bereit ist." STRING_NO_VOLUME "Kann Medium nicht abfragen" STRING_NO_VOLUME_SIZE "Kann Mediengröße nicht abfragen" STRING_FILESYSTEM "Der Typ des Dateisystems ist %s.\n" @@ -35,7 +35,7 @@ BEGIN STRING_CREATE_FSYS "Erzeuge Dateisystem-Strukturen.\n" STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n" STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n" - STRING_ENTER_LABEL "Datenträgerbezeichnung (11 Zeichen, Eingabetaste für keine)? " + STRING_ENTER_LABEL "Datenträgerbezeichnung (11 Zeichen, ENTER für keine)? " STRING_NO_LABEL "Konnte Datenträger nicht benennen" STRING_FREE_SPACE "\n%I64d Bytes Speicherkapazität.\n%I64d Bytes freier Speicher.\n" STRING_SERIAL_NUMBER "\nDatenträger-Seriennummer ist %04X-%04X\n" diff --git a/modules/rosapps/applications/winfile/lang/de-DE.rc b/modules/rosapps/applications/winfile/lang/de-DE.rc index 9d51b439103..1390903c8b1 100644 --- a/modules/rosapps/applications/winfile/lang/de-DE.rc +++ b/modules/rosapps/applications/winfile/lang/de-DE.rc @@ -32,13 +32,13 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_WINEFILE MENU { POPUP "&Datei" { - MENUITEM "Ö&ffnen\tEingabetaste", ID_ACTIVATE + MENUITEM "Ö&ffnen\tENTER", ID_ACTIVATE MENUITEM "&Verschieben...\tF7", ID_FILE_MOVE MENUITEM "&Kopieren...\tF8", ID_FILE_COPY MENUITEM "&In Zwischenablage...\tF9", 118 MENUITEM "&Löschen\tEntf", ID_FILE_DELETE MENUITEM "&Umbenennen...", 109 - MENUITEM "&Eigenschaften...\tAlt+Eingabetaste", ID_EDIT_PROPERTIES + MENUITEM "&Eigenschaften...\tAlt+ENTER", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "K&omprimieren...", 119 MENUITEM "Deko&mprimieren...", 120

2 years, 6 months

[reactos] 01/01: [USETUP] de-DE Update 2022-03-05 CORE-18075

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c791d4ee4e3ad2c7ae8df… commit c791d4ee4e3ad2c7ae8dfbdbb7ced9147a3b573f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Mar 5 18:23:33 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Mar 5 18:23:33 2022 +0100 [USETUP] de-DE Update 2022-03-05 CORE-18075 Avoids some typos like gew\201nste -> gew\201nschte gew\204hlten -> gew\204hlte Global replacement of fahr->setz to harmonize the mixed usage of Fortfahren vs Fortsetzen Also recently someone started using ENTER instead of EINGABETASTE and although I was pissed off by that in the beginning, after thinking twice: ENTER is the much better alternative to EINGABETASTE, because: - it does not need to be translated from english - it is shorter and therefore helps to avoid some needed abbreviations - it allows to avoid articles and therefore aligns better with other selections - it avoids translation errors like EINGABETASTER (and EEINGABETASTE in older branches) So I use that consistently throughout the translation now. Also shorten "Der PC wird automatisch neu gestartet" because that line was so long, that it looked odd. 88 Lines touched: "Der Führer wär stolz" --- base/setup/usetup/lang/de-DE.h | 176 ++++++++++++++++++++--------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index dc953ecb57f..10d7c8610cc 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -67,7 +67,7 @@ static MUI_ENTRY deDELanguagePageEntries[] = { 11, 11, - "verwenden wollen. Best\204tigen Sie die Auswahl mit der EINGABETASTE.", + "verwenden wollen. Best\204tigen Sie die Auswahl mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -81,7 +81,7 @@ static MUI_ENTRY deDELanguagePageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen F3 = Installation abbrechen", + "ENTER = Fortsetzen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -126,7 +126,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 8, 15, - "\x07 Dr\201cken Sie EINGABETASTE, um ReactOS zu installieren / aktualisieren", + "\x07 Dr\201cken Sie ENTER, um ReactOS zu installieren / aktualisieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -168,7 +168,7 @@ static MUI_ENTRY deDEWelcomePageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen R = Reparieren L = Lizenz F3 = Beenden", + "ENTER = Fortsetzen R = Reparieren L = Lizenz F3 = Beenden", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -234,7 +234,7 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 8, 19, - "\x07 Dr\201cken Sie EINGABETASTE, um das ReactOS Setup fortzusetzen.", + "\x07 Dr\201cken Sie ENTER, um das ReactOS Setup fortzusetzen.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -248,7 +248,7 @@ static MUI_ENTRY deDEIntroPageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen F3 = Abbrechen", + "ENTER = Fortsetzen F3 = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -300,7 +300,7 @@ static MUI_ENTRY deDELicensePageEntries[] = { 8, 11, - "S\204mtliche Softwarebestandteile in ReactOS sind daher unter der", + "Alle Softwarebestandteile in ReactOS sind daher unter der", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -391,7 +391,7 @@ static MUI_ENTRY deDELicensePageEntries[] = { 0, 0, - "EINGABETASTE = Zur\201ck", + "ENTER = Zur\201ck", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -470,7 +470,7 @@ static MUI_ENTRY deDEDevicePageEntries[] = { 6, 20, - "Dr\201cken Sie die EINGABETASTE, um eine Einstellung zu \204ndern.", + "Dr\201cken Sie ENTER, um eine Einstellung zu \204ndern.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -491,14 +491,14 @@ static MUI_ENTRY deDEDevicePageEntries[] = { 6, 24, - "einstellungen akzeptieren\" und best\204tigen mit der EINGABETASTE.", + "einstellungen akzeptieren\" und best\204tigen mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "EINGABETASTE = Fortsetzen F3 = Installation abbrechen", + "ENTER = Fortsetzen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -571,14 +571,14 @@ static MUI_ENTRY deDERepairPageEntries[] = { 8, 22, - "\x07 Dr\201cken Sie die EINGABETASTE, um den Computer neu zu starten.", + "\x07 Dr\201cken Sie ENTER, um den Computer neu zu starten.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ESC = Zur\201ck U = Aktualisieren R = Wiederherst. EINGABETASTE = Neustart", + "ESC = Zur\201ck U = Aktualisieren R = Wiederherst. ENTER = Neustart", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -616,7 +616,7 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 6, 10, - "eine besch\204digte ReactOS Installation zu reparieren.", + "eine bestehende ReactOS Installation zu reparieren.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -630,7 +630,7 @@ static MUI_ENTRY deDEUpgradePageEntries[] = { 8, 15, - "\x07 W\204hlen Sie mit den PFEILTASTEN die gew\201nste Installation aus.", + "\x07 W\204hlen Sie mit den PFEILTASTEN die gew\201nschte Installation aus.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -696,7 +696,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = { 8, 11, - " Typ zu w\204hlen. Best\204tigen Sie mit der EINGABETASTE.", + " Typ zu w\204hlen. Best\204tigen Sie mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -717,7 +717,7 @@ static MUI_ENTRY deDEComputerPageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -755,7 +755,7 @@ static MUI_ENTRY deDEFlushPageEntries[] = { 10, 9, - "Der PC wird automatisch neu gestartet, sobald der Vorgang beendet ist.", + "Der PC startet automatisch neu, sobald der Vorgang beendet ist.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -800,7 +800,7 @@ static MUI_ENTRY deDEQuitPageEntries[] = { 10, 11, - "Dr\201cken Sie die EINGABETASTE, um den Computer neu zu starten.", + "Dr\201cken Sie ENTER, um den Computer neu zu starten.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -845,7 +845,7 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { 8, 11, - " Typ zu w\204hlen. Best\204tigen Sie mit der EINGABETASTE.", + " Typ zu w\204hlen. Best\204tigen Sie mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -866,7 +866,7 @@ static MUI_ENTRY deDEDisplayPageEntries[] = { 0, 0, - "EINGABETASTE = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -904,14 +904,14 @@ static MUI_ENTRY deDESuccessPageEntries[] = { 10, 11, - "Dr\201cken Sie die EINGABETASTE, um den Computer neu zu starten.", + "Dr\201cken Sie ENTER, um den Computer neu zu starten.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "EINGABETASTE = Computer neu starten", + "ENTER = Computer neu starten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -956,14 +956,14 @@ static MUI_ENTRY deDEBootPageEntries[] = { 6, 14, - "dr\201cken Sie die EINGABETASTE.", + "dr\201cken Sie ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "EINGABETASTE = Fortsetzen F3 = Installation abbrechen", + "ENTER = Fortsetzen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1009,7 +1009,7 @@ static MUI_ENTRY deDESelectPartitionEntries[] = { 8, 13, - "\x07 Best\204tigen Sie Ihre Auswahl mit der EINGABETASTE.", + "\x07 ENTER best\204tigt Ihre Auswahl.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1166,7 +1166,7 @@ static MUI_ENTRY deDEChangeSystemPartition[] = { 0, 0, - "EINGABETASTE = Fortsetzen ESC = Abbrechen", + "ENTER = Fortsetzen ESC = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1274,7 +1274,7 @@ static MUI_ENTRY deDEConfirmDeleteSystemPartitionEntries[] = { 0, 0, - "ENTER=Fortsetzen ESC=Abbrechen", + "ENTER = Fortsetzen ESC = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1312,14 +1312,14 @@ static MUI_ENTRY deDEFormatPartitionEntries[] = { 6, 12, - "Dr\201cken Sie die EINGABETASTE, um fortzufahren.", + "Dr\201cken Sie ENTER, um fortzusetzen.", TEXT_STYLE_NORMAL, TEXT_ID_FORMAT_PROMPT }, { 0, 0, - "EINGABETASTE = Fortfahren F3 = Installation abbrechen", + "ENTER = Fortsetzen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1402,14 +1402,14 @@ static MUI_ENTRY deDEInstallDirectoryEntries[] = { 6, 17, - "Best\204tigen Sie die Eingabe mit der EINGABETASTE.", + "Best\204tigen Sie die Eingabe mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "EINGABETASTE = Fortfahren F3 = Installation abbrechen", + "ENTER = Fortsetzen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1513,7 +1513,7 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { 0, 0, - "EINGABETASTE = Fortfahren F3 = Abbrechen", + "ENTER = Fortsetzen F3 = Abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1575,7 +1575,7 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { 8, 11, - " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit der EINGABETASTE.", + " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1596,7 +1596,7 @@ static MUI_ENTRY deDEKeyboardSettingsEntries[] = { 0, 0, - "EINGABETASTE = Fortfahren ESC = Abbrechen F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Abbrechen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1634,7 +1634,7 @@ static MUI_ENTRY deDELayoutSettingsEntries[] = { 8, 11, - " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit der EINGABETASTE.", + " zu w\204hlen. Best\204tigen Sie Ihre Auswahl mit ENTER.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1655,7 +1655,7 @@ static MUI_ENTRY deDELayoutSettingsEntries[] = { 0, 0, - "EINGABETASTE = Fortfahren ESC = Abbrechen F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Abbrechen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1724,7 +1724,7 @@ static MUI_ENTRY deDESelectFSEntries[] = { 8, 21, - "\x07 Dr\201cken Sie die EINGABETASTE, um die Partition zu formatieren.", + "\x07 Dr\201cken Sie ENTER, um die Partition zu formatieren.", 0 }, { @@ -1736,7 +1736,7 @@ static MUI_ENTRY deDESelectFSEntries[] = { 0, 0, - "EINGABETASTE = Fortfahren ESC = Zur\201ck F3 = Installation abbrechen", + "ENTER = Fortsetzen ESC = Zur\201ck F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -1844,79 +1844,79 @@ MUI_ERROR deDEErrorEntries[] = "Wenn Sie die Installation jetzt beenden, m\201ssen Sie diese\n" "erneut starten, um ReactOS zu installieren.\n" "\n" - " \x07 Dr\201cken Sie die EINGABETASTE, um die Installation fortzusetzen.\n" + " \x07 Dr\201cken Sie ENTER, um die Installation fortzusetzen.\n" " \x07 Dr\201cken Sie F3, um die Installation zu beenden.", - "F3 = Beenden EINGABETASTE = Fortsetzen" + "F3 = Beenden ENTER = Fortsetzen" }, { // ERROR_NO_BUILD_PATH "Die Installationspfade f\201r das ReactOS Installationsverzeichnis konnten nicht erstellt werden!\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_SOURCE_PATH "Die Partition kann nicht gel\224scht werden, weil sie die Installationsquellen beherbergt!\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_SOURCE_DIR "ReactOS kann nicht in dasselbe Verzeichnis installiert werden, in dem die Installationsquellen liegen!\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_NO_HDD "Es konnte keine Festplatte gefunden werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_NO_SOURCE_DRIVE "Es konnte kein Installationsmedium gefunden werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_LOAD_TXTSETUPSIF "TXTSETUP.SIF konnte nicht gefunden werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CORRUPT_TXTSETUPSIF "TXTSETUP.SIF scheint besch\204digt zu sein.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_SIGNATURE_TXTSETUPSIF, "Es wurde eine ung\201ltige Signatur in TXTSETUP.SIF gefunden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_DRIVE_INFORMATION "Es konnten keine Laufwerksinformationen abgefragt werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_WRITE_BOOT, "Der %S-Bootcode konnte nicht auf der Partition installiert werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_LOAD_COMPUTER, "Computertypenliste konnte nicht geladen werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_LOAD_DISPLAY, "Displayeinstellungsliste konnte nicht geladen werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_LOAD_KEYBOARD, "Tastaturtypenliste konnte nicht geladen werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_LOAD_KBLAYOUT, "Die Liste der Tastaturlayouts konnte nicht geladen werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_WARN_PARTITION, @@ -1926,8 +1926,8 @@ MUI_ERROR deDEErrorEntries[] = "\216nderungen an den Partitionen k\224nnen die Partitionstabelle zerst\224ren!\n" "\n" " \x07 Dr\201cken Sie F3, um die Installation zu beenden.\n" - " \x07 Dr\201cken Sie die EINGABETASTE, um die Installation fortzusetzen.", - "F3 = Beenden EINGABETASTE = Fortsetzen" + " \x07 Dr\201cken Sie ENTER, um die Installation fortzusetzen.", + "F3 = Beenden ENTER = Fortsetzen" }, { // ERROR_NEW_PARTITION, @@ -1947,112 +1947,112 @@ MUI_ERROR deDEErrorEntries[] = { // ERROR_INSTALL_BOOTCODE, "Der %S-Bootcode konnte nicht auf der Partition installiert werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_NO_FLOPPY, "Keine Diskette in Laufwerk A: gefunden.", - "EINGABETASTE = Fortsetzen" + "ENTER = Fortsetzen" }, { // ERROR_UPDATE_KBSETTINGS, "Das Tastaturlayout konnte nicht aktualisiert werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_UPDATE_DISPLAY_SETTINGS, "Die Registrierungseintr\204ge der Anzeigeeinstellungen\n" "konnten nicht aktualisiert werden.", - "EINGABETASTER = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_IMPORT_HIVE, "Es konnte keine Hive-Datei importiert werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_FIND_REGISTRY "Die Registrierungsdateien konnten nicht gefunden werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CREATE_HIVE, "Die Zweige in der Registrierung konnten nicht erstellt werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_INITIALIZE_REGISTRY, "Die Registrierung konnte nicht initialisiert werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_INVALID_CABINET_INF, "Das CAB-Archiv besitzt keine g\201ltige INF-Datei.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CABINET_MISSING, "Das CAB-Archiv wurde nicht gefunden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CABINET_SCRIPT, "Das CAB-Archiv enth\204lt kein Setup-Skript.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_COPY_QUEUE, "Die Liste mit den zu kopierenden Dateien\n" "konnte nicht gefunden werden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CREATE_DIR, "Die Installationspfade konnten nicht erstellt werden.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_TXTSETUP_SECTION, "Setup konnte die '%S'-Sektion in\n" "TXTSETUP.SIF nicht finden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CABINET_SECTION, "Setup konnte die '%S'-Sektion im\n" "CAB-Archiv nicht finden.\n", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_CREATE_INSTALL_DIR "Setup konnte den Installationspfad nicht erstellen.", - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_WRITE_PTABLE, "Die Partitionstabellen konnten nicht geschrieben werden.\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_ADDING_CODEPAGE, "Es konnte kein Codepage-Eintrag hinzugef\201gt werden.\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_UPDATE_LOCALESETTINGS, "Die Systemsprache konnte nicht eingestellt werden.\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_ADDING_KBLAYOUTS, "Die Tastaturlayouts konnten nicht in die Registrierung\n" "eingetragen werden.\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_UPDATE_GEOID, "Der geografische Standort konnte nicht eingestellt werden.\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { // ERROR_DIRECTORY_NAME, @@ -2062,7 +2062,7 @@ MUI_ERROR deDEErrorEntries[] = }, { // ERROR_INSUFFICIENT_PARTITION_SIZE, - "Die gew\204hlten Partition ist nicht gro\341 genug, um ReactOS zu installieren.\n" + "Die gew\204hlte Partition ist nicht gro\341 genug, um ReactOS zu installieren.\n" "Die Installationspartition muss mindestens %lu MB gro\341 sein.\n" "\n" " * Eine beliebige Taste zum Fortsetzen dr\201cken.", @@ -2086,7 +2086,7 @@ MUI_ERROR deDEErrorEntries[] = "Setup konnte die Partition nicht formatieren:\n" " %S\n" "\n" - "EINGABETASTE = Computer neu starten" + "ENTER = Computer neu starten" }, { NULL, @@ -2223,11 +2223,11 @@ MUI_STRING deDEStrings[] = {STRING_PLEASEWAIT, " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, - " EINGABETASTE = Installieren P = Prim\204re E = Erweiterte F3 = Installation abbr."}, + " ENTER = Installieren P = Prim\204re E = Erweiterte F3 = Installation abbr."}, {STRING_INSTALLCREATELOGICAL, - " EINGABETASTE = Installieren L = Logisches Laufwerk F3 = Installation abbr."}, + " ENTER = Installieren L = Logisches Laufwerk F3 = Installation abbrechen"}, {STRING_INSTALLDELETEPARTITION, - " EINGABETASTE = Installieren D = Partition l\224schen F3 = Installation abbr."}, + " ENTER = Installieren D = Partition l\224schen F3 = Installation abbrechen"}, {STRING_DELETEPARTITION, " D = Partition l\224schen F3 = Installation abbrechen"}, {STRING_PARTITIONSIZE, @@ -2241,7 +2241,7 @@ MUI_STRING deDEStrings[] = {STRING_HDDSIZE, "Bitte geben Sie die Gr\224\341e der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, - " EINGABETASTE = Partition erstellen ESC = Abbrechen F3 = Installation abbr."}, + " ENTER = Partition erstellen ESC = Abbrechen F3 = Installation abbrechen"}, {STRING_PARTFORMAT, "Diese Partition wird als n\204chstes formatiert."}, {STRING_NONFORMATTEDPART, @@ -2253,11 +2253,11 @@ MUI_STRING deDEStrings[] = {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, {STRING_CONTINUE, - "EINGABETASTE = Fortsetzen"}, + "ENTER = Fortsetzen"}, {STRING_QUITCONTINUE, - "F3 = Beenden EINGABETASTE = Fortsetzen"}, + "F3 = Beenden ENTER = Fortsetzen"}, {STRING_REBOOTCOMPUTER, - "EINGABETASTE = Computer neu starten"}, + "ENTER = Computer neu starten"}, {STRING_DELETING, " Deleting file: %S"}, {STRING_MOVING, @@ -2283,7 +2283,7 @@ MUI_STRING deDEStrings[] = {STRING_DONE, " Fertig..."}, {STRING_REBOOTCOMPUTER2, - " EINGABETASTE = Computer neu starten"}, + " ENTER = Computer neu starten"}, {STRING_REBOOTPROGRESSBAR, " Der Computer wird in %li Sekunde(n) neugestartet... "}, {STRING_CONSOLEFAIL1,

2 years, 6 months

[reactos] 01/01: [NTUSER] Fix Toolbar re-painting when Rebar parent has been altered (#4380) CORE-12342

by Julio Carchi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea7c14919ea83e2c4b444… commit ea7c14919ea83e2c4b44472b729c42a7bdee6d67 Author: Julio Carchi <julcar(a)informaticos.com> AuthorDate: Fri Mar 4 13:40:57 2022 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 4 19:40:57 2022 +0100 [NTUSER] Fix Toolbar re-painting when Rebar parent has been altered (#4380) CORE-12342 If a Rebar window is altered by calling either ShowWindow() or UpdateWindow() then we were only updating the parent and omitting their children windows. This is closer to the behavior of the very very old SVN r27394 == git f1a7f30 . And therefore intentionally excludes parts of SVN r27403 == git e2651a0 . The bots have no complaints about it: KVM https://reactos.org/testman/compare.php?ids=81266,81290 VBox https://reactos.org/testman/compare.php?ids=81267,81291 --- win32ss/user/ntuser/winpos.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 4586d2357dc..eba590fad13 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2103,10 +2103,7 @@ co_WinPosSetWindowPos( IntInvalidateWindows( Parent, DirtyRgn, RDW_ERASE | RDW_INVALIDATE); co_IntPaintWindows(Parent, RDW_NOCHILDREN, FALSE); } - else - { - IntInvalidateWindows( Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); - } + IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. {

2 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022