Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Use wide char string literals.
by Hermès Bélusca-Maïto 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83be315abffe14f0b391f… commit 83be315abffe14f0b391ff9cd543010aa0d57b9e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 9 22:38:31 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 9 22:39:29 2022 +0100 [SHELL32] Use wide char string literals. Import parts of Wine commit b215536852dc5a132108db92c90a41c70b738e50 shell32: Use wide char string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/shell32/CDefView.cpp | 6 +- dll/win32/shell32/CQueryAssociations.cpp | 45 +-- dll/win32/shell32/dialogs/dialogs.cpp | 3 +- dll/win32/shell32/dialogs/view.cpp | 8 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 3 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 12 +- dll/win32/shell32/folders/CFSFolder.cpp | 45 +-- dll/win32/shell32/folders/CRegFolder.cpp | 18 +- dll/win32/shell32/iconcache.cpp | 22 +- dll/win32/shell32/shlexec.cpp | 152 +++++----- dll/win32/shell32/shlfileop.cpp | 26 +- dll/win32/shell32/wine/brsfolder.c | 17 +- dll/win32/shell32/wine/classes.c | 42 +-- dll/win32/shell32/wine/control.c | 7 +- dll/win32/shell32/wine/shell32_main.c | 106 ++++--- dll/win32/shell32/wine/shellole.c | 11 +- dll/win32/shell32/wine/shellord.c | 32 +- dll/win32/shell32/wine/shellpath.c | 337 ++++++++-------------- dll/win32/shell32/wine/shellstring.c | 4 +- dll/win32/shell32/wine/shlmenu.c | 3 +- dll/win32/shell32/wine/shpolicy.c | 20 +- 21 files changed, 337 insertions(+), 582 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 8a4fc939789..45d1e4ce827 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -40,10 +40,6 @@ TODO: WINE_DEFAULT_DEBUG_CHANNEL(shell); -#undef SV_CLASS_NAME - -static const WCHAR SV_CLASS_NAME[] = {'S', 'H', 'E', 'L', 'L', 'D', 'L', 'L', '_', 'D', 'e', 'f', 'V', 'i', 'e', 'w', 0}; - typedef struct { BOOL bIsAscending; @@ -298,7 +294,7 @@ class CDefView : { { sizeof(WNDCLASSEX), CS_PARENTDC, StartWindowProc, 0, 0, NULL, NULL, - LoadCursor(NULL, IDC_ARROW), NULL, NULL, SV_CLASS_NAME, NULL + LoadCursor(NULL, IDC_ARROW), NULL, NULL, L"SHELLDLL_DefView", NULL }, NULL, NULL, IDC_ARROW, TRUE, 0, _T("") }; diff --git a/dll/win32/shell32/CQueryAssociations.cpp b/dll/win32/shell32/CQueryAssociations.cpp index a11a79a65fd..093a536b4a1 100644 --- a/dll/win32/shell32/CQueryAssociations.cpp +++ b/dll/win32/shell32/CQueryAssociations.cpp @@ -73,8 +73,6 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::Init( HKEY hkeyProgid, HWND hWnd) { - static const WCHAR szProgID[] = L"ProgID"; - TRACE("(%p)->(%d,%s,%p,%p)\n", this, cfFlags, debugstr_w(pszAssoc), @@ -128,11 +126,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::Init( { HKEY progIdKey; /* for a clsid, the progid is the default value of the ProgID subkey */ - ret = RegOpenKeyExW(this->hkeySource, - szProgID, - 0, - KEY_READ, - &progIdKey); + ret = RegOpenKeyExW(this->hkeySource, L"ProgID", 0, KEY_READ, &progIdKey); if (ret != ERROR_SUCCESS) return S_OK; hr = this->GetValue(progIdKey, NULL, (void**)&progId, NULL); @@ -274,8 +268,6 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( DWORD size, retval = 0; UINT flen; WCHAR *bufW; - static const WCHAR translationW[] = L"\\VarFileInfo\\Translation"; - static const WCHAR fileDescFmtW[] = L"\\StringFileInfo\\%04x%04x\\FileDescription"; WCHAR fileDescW[41]; hr = this->GetExecutable(pszExtra, path, MAX_PATH, &len); @@ -297,13 +289,14 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( { goto get_friendly_name_fail; } - if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen)) + if (VerQueryValueW(verinfoW, L"\\VarFileInfo\\Translation", (LPVOID *)&bufW, &flen)) { UINT i; DWORD *langCodeDesc = (DWORD *)bufW; for (i = 0; i < flen / sizeof(DWORD); i++) { - sprintfW(fileDescW, fileDescFmtW, LOWORD(langCodeDesc[i]), HIWORD(langCodeDesc[i])); + sprintfW(fileDescW, L"\\StringFileInfo\\%04x%04x\\FileDescription", + LOWORD(langCodeDesc[i]), HIWORD(langCodeDesc[i])); if (VerQueryValueW(verinfoW, fileDescW, (LPVOID *)&bufW, &flen)) { /* Does strlenW(bufW) == 0 mean we use the filename? */ @@ -325,10 +318,8 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( } case ASSOCSTR_CONTENTTYPE: { - static const WCHAR Content_TypeW[] = L"Content Type"; - DWORD size = 0; - DWORD ret = RegGetValueW(this->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, NULL, &size); + DWORD ret = RegGetValueW(this->hkeySource, NULL, L"Content Type", RRF_RT_REG_SZ, NULL, NULL, &size); if (ret != ERROR_SUCCESS) { return HRESULT_FROM_WIN32(ret); @@ -336,7 +327,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( WCHAR *contentType = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); if (contentType != NULL) { - ret = RegGetValueW(this->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); + ret = RegGetValueW(this->hkeySource, NULL, L"Content Type", RRF_RT_REG_SZ, NULL, contentType, &size); if (ret == ERROR_SUCCESS) { hr = this->ReturnString(flags, pszOut, pcchOut, contentType, strlenW(contentType) + 1); @@ -355,16 +346,15 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( } case ASSOCSTR_DEFAULTICON: { - static const WCHAR DefaultIconW[] = L"DefaultIcon"; DWORD ret; DWORD size = 0; - ret = RegGetValueW(this->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); + ret = RegGetValueW(this->hkeyProgID, L"DefaultIcon", NULL, RRF_RT_REG_SZ, NULL, NULL, &size); if (ret == ERROR_SUCCESS) { WCHAR *icon = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); if (icon) { - ret = RegGetValueW(this->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); + ret = RegGetValueW(this->hkeyProgID, L"DefaultIcon", NULL, RRF_RT_REG_SZ, NULL, icon, &size); if (ret == ERROR_SUCCESS) { hr = this->ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); @@ -388,8 +378,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( } case ASSOCSTR_SHELLEXTENSION: { - static const WCHAR shellexW[] = L"ShellEx\\"; - WCHAR keypath[sizeof(shellexW) / sizeof(shellexW[0]) + 39], guid[39]; + WCHAR keypath[ARRAY_SIZE(L"ShellEx\\") + 39], guid[39]; CLSID clsid; HKEY hkey; @@ -398,7 +387,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( { return hr; } - strcpyW(keypath, shellexW); + strcpyW(keypath, L"ShellEx\\"); strcatW(keypath, pszExtra); LONG ret = RegOpenKeyExW(this->hkeySource, keypath, 0, KEY_READ, &hkey); if (ret) @@ -467,8 +456,6 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetKey( */ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA assocdata, LPCWSTR pszExtra, LPVOID pvOut, DWORD *pcbOut) { - static const WCHAR edit_flags[] = L"EditFlags"; - TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", this, cfFlags, assocdata, debugstr_w(pszExtra), pvOut, pcbOut); @@ -488,7 +475,7 @@ HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA void *data; DWORD size; - HRESULT hres = this->GetValue(this->hkeyProgID, edit_flags, &data, &size); + HRESULT hres = this->GetValue(this->hkeyProgID, L"EditFlags", &data, &size); if(FAILED(hres)) { return hres; @@ -582,8 +569,6 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command) LONG ret; WCHAR *extra_from_reg = NULL; WCHAR *filetype; - static const WCHAR commandW[] = L"command"; - static const WCHAR shellW[] = L"shell"; /* When looking for file extension it's possible to have a default value that points to another key that contains 'shell/<verb>/command' subtree. */ @@ -597,17 +582,17 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command) if (ret == ERROR_SUCCESS) { - ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + ret = RegOpenKeyExW(hkeyFile, L"shell", 0, KEY_READ, &hkeyShell); RegCloseKey(hkeyFile); } else { - ret = RegOpenKeyExW(this->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + ret = RegOpenKeyExW(this->hkeySource, L"shell", 0, KEY_READ, &hkeyShell); } } else { - ret = RegOpenKeyExW(this->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + ret = RegOpenKeyExW(this->hkeySource, L"shell", 0, KEY_READ, &hkeyShell); } if (ret) @@ -659,7 +644,7 @@ HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command) return HRESULT_FROM_WIN32(ret); } /* open command subkey */ - ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); + ret = RegOpenKeyExW(hkeyVerb, L"command", 0, KEY_READ, &hkeyCommand); RegCloseKey(hkeyVerb); if (ret) { diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 832e32c8a96..73de2f363ac 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -435,7 +435,6 @@ static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) { const WCHAR *src; WCHAR *dest, *result, *result_end=NULL; - static const WCHAR dotexeW[] = L".exe"; result = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(strlenW(cmdline)+5)); @@ -466,7 +465,7 @@ static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) *dest = 0; if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) break; - strcatW(dest, dotexeW); + strcatW(dest, L".exe"); if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) break; } diff --git a/dll/win32/shell32/dialogs/view.cpp b/dll/win32/shell32/dialogs/view.cpp index 648915a0441..e8603d345d3 100644 --- a/dll/win32/shell32/dialogs/view.cpp +++ b/dll/win32/shell32/dialogs/view.cpp @@ -441,9 +441,6 @@ ViewTree_LoadTree(HKEY hKey, LPCWSTR pszKeyName, DWORD dwParentID) static BOOL ViewTree_LoadAll(VOID) { - static const WCHAR s_szAdvanced[] = - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"; - // free if already existed if (s_ViewTreeEntries) { @@ -453,8 +450,9 @@ static BOOL ViewTree_LoadAll(VOID) s_ViewTreeEntryCount = 0; HKEY hKey; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szAdvanced, 0, - KEY_READ, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + 0, KEY_READ, &hKey) != ERROR_SUCCESS) { return FALSE; // failure } diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index e4133520100..c4d9eddf670 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -623,10 +623,9 @@ HRESULT WINAPI CControlPanelFolder::Initialize(PCIDLIST_ABSOLUTE pidl) /* Create the inner reg folder */ HRESULT hr; - static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"; hr = CRegFolder_CreateInstance(&CLSID_ControlPanel, pidlRoot, - pszCPanelPath, + L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", L"ControlPanel", IID_PPV_ARG(IShellFolder2, &m_regFolder)); if (FAILED_UNEXPECTEDLY(hr)) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 35c4952c060..a64182e1dc9 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -411,8 +411,6 @@ getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags, WCHAR wszPath[MAX_PATH]; WCHAR wszAutoRunInfPath[MAX_PATH]; WCHAR wszValue[MAX_PATH], wszTemp[MAX_PATH]; - static const WCHAR wszAutoRunInf[] = { 'a','u','t','o','r','u','n','.','i','n','f',0 }; - static const WCHAR wszAutoRun[] = { 'a','u','t','o','r','u','n',0 }; // get path if (!ILGetDisplayNameExW(psf, pidl, wszPath, 0)) @@ -422,10 +420,10 @@ getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags, // build the full path of autorun.inf StringCchCopyW(wszAutoRunInfPath, _countof(wszAutoRunInfPath), wszPath); - PathAppendW(wszAutoRunInfPath, wszAutoRunInf); + PathAppendW(wszAutoRunInfPath, L"autorun.inf"); // autorun.inf --> wszValue - if (GetPrivateProfileStringW(wszAutoRun, L"icon", NULL, wszValue, _countof(wszValue), + if (GetPrivateProfileStringW(L"autorun", L"icon", NULL, wszValue, _countof(wszValue), wszAutoRunInfPath) && wszValue[0] != 0) { // wszValue --> wszTemp @@ -977,8 +975,6 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla { WCHAR wszDrive[18] = {0}; DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; - static const WCHAR wszOpenBracket[] = {' ', '(', 0}; - static const WCHAR wszCloseBracket[] = {')', 0}; lstrcpynW(wszDrive, pszPath, 4); pszPath[0] = L'\0'; @@ -1012,10 +1008,10 @@ HRESULT WINAPI CDrivesFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFla pszPath[MAX_PATH-7] = L'\0'; } } - wcscat (pszPath, wszOpenBracket); + wcscat (pszPath, L" ("); wszDrive[2] = L'\0'; wcscat (pszPath, wszDrive); - wcscat (pszPath, wszCloseBracket); + wcscat (pszPath, L")"); } if (SUCCEEDED(hr)) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index b1c578ada8b..72325d3973b 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -136,9 +136,7 @@ HRESULT GetCLSIDForFileType(PCUIDLIST_RELATIVE pidl, LPCWSTR KeyName, CLSID* pcl static HRESULT getDefaultIconLocation(LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT uFlags) { - static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; - - if (!HCR_GetIconW(folder, szIconFile, NULL, cchMax, piIndex)) + if (!HCR_GetIconW(L"Folder", szIconFile, NULL, cchMax, piIndex)) { lstrcpynW(szIconFile, swShell32Name, cchMax); *piIndex = -IDI_SHELL_FOLDER; @@ -156,12 +154,10 @@ getDefaultIconLocation(LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT uFlags return S_OK; } -static const WCHAR s_shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; - static BOOL getShellClassInfo(LPCWSTR Entry, LPWSTR pszValue, DWORD cchValueLen, LPCWSTR IniFile) { - return GetPrivateProfileStringW(s_shellClassInfo, Entry, NULL, pszValue, cchValueLen, IniFile); + return GetPrivateProfileStringW(L".ShellClassInfo", Entry, NULL, pszValue, cchValueLen, IniFile); } static HRESULT @@ -171,12 +167,6 @@ getIconLocationForFolder(IShellFolder * psf, PCITEMID_CHILD pidl, UINT uFlags, DWORD dwFileAttrs; WCHAR wszPath[MAX_PATH]; WCHAR wszIniFullPath[MAX_PATH]; - static const WCHAR iconFile[] = { 'I', 'c', 'o', 'n', 'F', 'i', 'l', 'e', 0 }; - static const WCHAR clsid[] = { 'C', 'L', 'S', 'I', 'D', 0 }; - static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; - static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; - static const WCHAR iconResource[] = { 'I', 'c', 'o', 'n', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 0 }; - static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; if (uFlags & GIL_DEFAULTICON) goto Quit; @@ -194,10 +184,10 @@ getIconLocationForFolder(IShellFolder * psf, PCITEMID_CHILD pidl, UINT uFlags, // build the full path of ini file StringCchCopyW(wszIniFullPath, _countof(wszIniFullPath), wszPath); - PathAppendW(wszIniFullPath, wszDesktopIni); + PathAppendW(wszIniFullPath, L"desktop.ini"); WCHAR wszValue[MAX_PATH], wszTemp[MAX_PATH]; - if (getShellClassInfo(iconFile, wszValue, _countof(wszValue), wszIniFullPath)) + if (getShellClassInfo(L"IconFile", wszValue, _countof(wszValue), wszIniFullPath)) { // wszValue --> wszTemp ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp)); @@ -211,20 +201,20 @@ getIconLocationForFolder(IShellFolder * psf, PCITEMID_CHILD pidl, UINT uFlags, // wszPath --> szIconFile GetFullPathNameW(wszPath, cchMax, szIconFile, NULL); - *piIndex = GetPrivateProfileIntW(s_shellClassInfo, iconIndex, 0, wszIniFullPath); + *piIndex = GetPrivateProfileIntW(L".ShellClassInfo", L"IconIndex", 0, wszIniFullPath); return S_OK; } - else if (getShellClassInfo(clsid, wszValue, _countof(wszValue), wszIniFullPath) && + else if (getShellClassInfo(L"CLSID", wszValue, _countof(wszValue), wszIniFullPath) && HCR_GetIconW(wszValue, szIconFile, NULL, cchMax, piIndex)) { return S_OK; } - else if (getShellClassInfo(clsid2, wszValue, _countof(wszValue), wszIniFullPath) && + else if (getShellClassInfo(L"CLSID2", wszValue, _countof(wszValue), wszIniFullPath) && HCR_GetIconW(wszValue, szIconFile, NULL, cchMax, piIndex)) { return S_OK; } - else if (getShellClassInfo(iconResource, wszValue, _countof(wszValue), wszIniFullPath)) + else if (getShellClassInfo(L"IconResource", wszValue, _countof(wszValue), wszIniFullPath)) { // wszValue --> wszTemp ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp)); @@ -590,6 +580,7 @@ static HRESULT SHELL32_GetCLSIDForDirectory(LPCWSTR pwszDir, LPCWSTR KeyName, CL { WCHAR wszCLSIDValue[CHARS_IN_GUID]; WCHAR wszDesktopIni[MAX_PATH]; + StringCchCopyW(wszDesktopIni, MAX_PATH, pwszDir); StringCchCatW(wszDesktopIni, MAX_PATH, L"\\desktop.ini"); @@ -1265,10 +1256,6 @@ HRESULT WINAPI CFSFolder::GetUIObjectOf(HWND hwndOwner, return hr; } -static const WCHAR AdvancedW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"; -static const WCHAR HideFileExtW[] = L"HideFileExt"; -static const WCHAR NeverShowExtW[] = L"NeverShowExt"; - /****************************************************************************** * SHELL_FS_HideExtension [Internal] * @@ -1289,11 +1276,12 @@ BOOL SHELL_FS_HideExtension(LPCWSTR szPath) BOOL doHide = FALSE; /* The default value is FALSE (win98 at least) */ LONG lError; - lError = RegCreateKeyExW(HKEY_CURRENT_USER, AdvancedW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, + lError = RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, NULL); if (lError == ERROR_SUCCESS) { - lError = RegQueryValueExW(hKey, HideFileExtW, NULL, NULL, (LPBYTE)&dwData, &dwDataSize); + lError = RegQueryValueExW(hKey, L"HideFileExt", NULL, NULL, (LPBYTE)&dwData, &dwDataSize); if (lError == ERROR_SUCCESS) doHide = dwData; RegCloseKey(hKey); @@ -1312,7 +1300,7 @@ BOOL SHELL_FS_HideExtension(LPCWSTR szPath) lError = RegOpenKeyW(HKEY_CLASSES_ROOT, classname, &hKey); if (lError == ERROR_SUCCESS) { - lError = RegQueryValueExW(hKey, NeverShowExtW, NULL, NULL, NULL, NULL); + lError = RegQueryValueExW(hKey, L"NeverShowExt", NULL, NULL, NULL, NULL); if (lError == ERROR_SUCCESS) doHide = TRUE; @@ -1716,13 +1704,10 @@ HRESULT WINAPI CFSFolder::GetFolderTargetInfo(PERSIST_FOLDER_TARGET_INFO * ppfti HRESULT CFSFolder::_CreateExtensionUIObject(PCUIDLIST_RELATIVE pidl, REFIID riid, LPVOID *ppvOut) { - static const WCHAR formatW[] = {'S','h','e','l','l','E','x','\\', - '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', - '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; WCHAR buf[MAX_PATH]; - sprintfW(buf, formatW, riid.Data1, riid.Data2, riid.Data3, + sprintfW(buf, L"ShellEx\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid.Data1, riid.Data2, riid.Data3, riid.Data4[0], riid.Data4[1], riid.Data4[2], riid.Data4[3], riid.Data4[4], riid.Data4[5], riid.Data4[6], riid.Data4[7]); diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 77a2b323a8b..71e5e062eb8 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -141,14 +141,9 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO return E_FAIL; /* my computer and other shell extensions */ - static const WCHAR fmt[] = { 'C', 'L', 'S', 'I', 'D', '\\', - '{', '%', '0', '8', 'l', 'x', '-', '%', '0', '4', 'x', '-', '%', '0', '4', 'x', '-', - '%', '0', '2', 'x', '%', '0', '2', 'x', '-', '%', '0', '2', 'x', '%', '0', '2', 'x', - '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '%', '0', '2', 'x', '}', 0 - }; WCHAR xriid[50]; - swprintf(xriid, fmt, + swprintf(xriid, L"CLSID\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -156,8 +151,6 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO const WCHAR* iconname = NULL; if (_ILIsBitBucket(pidl)) { - static const WCHAR szFull[] = {'F','u','l','l',0}; - static const WCHAR szEmpty[] = {'E','m','p','t','y',0}; CComPtr<IEnumIDList> EnumIDList; CoInitialize(NULL); @@ -175,9 +168,9 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO if (SUCCEEDED(hr) && (hr = EnumIDList->Next(1, &pidl, &itemcount)) == S_OK) { CoTaskMemFree(pidl); - iconname = szFull; + iconname = L"Full"; } else { - iconname = szEmpty; + iconname = L"Empty"; } } @@ -225,12 +218,13 @@ CRegFolderEnum::~CRegFolderEnum() HRESULT CRegFolderEnum::Initialize(LPCWSTR lpszEnumKeyName, DWORD dwFlags) { WCHAR KeyName[MAX_PATH]; - static const WCHAR KeyNameFormat[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\Namespace"; if (!(dwFlags & SHCONTF_FOLDERS)) return S_OK; - HRESULT hr = StringCchPrintfW(KeyName, MAX_PATH, KeyNameFormat, lpszEnumKeyName); + HRESULT hr = StringCchPrintfW(KeyName, MAX_PATH, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\%s\\Namespace", + lpszEnumKeyName); if (FAILED_UNEXPECTEDLY(hr)) return hr; diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index 6560bae2de2..9a55f0f9fc0 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -659,32 +659,26 @@ static int SIC_LoadOverlayIcon(int icon_idx) LPCWSTR iconPath; int iconIdx; - static const WCHAR wszShellIcons[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','I','c','o','n','s',0 - }; - static const WCHAR wszNumFmt[] = {'%','d',0}; - iconPath = swShell32Name; /* default: load icon from shell32.dll */ iconIdx = icon_idx; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszShellIcons, 0, KEY_READ, &hKeyShellIcons) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Icons", + 0, KEY_READ, &hKeyShellIcons) == ERROR_SUCCESS) { DWORD count = sizeof(buffer); - swprintf(wszIdx, wszNumFmt, icon_idx); + swprintf(wszIdx, L"%d", icon_idx); /* read icon path and index */ if (RegQueryValueExW(hKeyShellIcons, wszIdx, NULL, NULL, (LPBYTE)buffer, &count) == ERROR_SUCCESS) { - LPWSTR p = wcschr(buffer, ','); + LPWSTR p = wcschr(buffer, ','); - if (p) - *p++ = 0; + if (p) + *p++ = 0; - iconPath = buffer; - iconIdx = _wtoi(p); + iconPath = buffer; + iconIdx = _wtoi(p); } RegCloseKey(hKeyShellIcons); diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index d5bdf5452e6..955d2af840e 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -25,10 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(exec); -static const WCHAR wszOpen[] = L"open"; -static const WCHAR wszExe[] = L".exe"; -static const WCHAR wszCom[] = L".com"; - #define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY) typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, @@ -270,7 +266,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* if (!done || (*fmt == '1')) { /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(lpDir, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(lpDir, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) cmd = xlpFile; else cmd = lpFile; @@ -353,7 +349,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* pv = SHLockShared(hmem, 0); chars = swprintf(buf, L":%p", pv); - if (chars >= sizeof(buf) / sizeof(WCHAR)) + if (chars >= ARRAY_SIZE(buf)) ERR("pidl format buffer too small!\n"); used += chars; @@ -547,7 +543,6 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, */ static LPWSTR SHELL_BuildEnvW( const WCHAR *path ) { - static const WCHAR wPath[] = L"PATH="; WCHAR *strings, *new_env; WCHAR *p, *p2; int total = wcslen(path) + 1; @@ -558,7 +553,7 @@ static LPWSTR SHELL_BuildEnvW( const WCHAR *path ) while (*p) { int len = wcslen(p) + 1; - if (!_wcsnicmp( p, wPath, 5 )) got_path = TRUE; + if (!_wcsnicmp( p, L"PATH=", 5 )) got_path = TRUE; total += len; p += len; } @@ -576,7 +571,7 @@ static LPWSTR SHELL_BuildEnvW( const WCHAR *path ) { int len = wcslen(p) + 1; memcpy(p2, p, len * sizeof(WCHAR)); - if (!_wcsnicmp( p, wPath, 5 )) + if (!_wcsnicmp( p, L"PATH=", 5 )) { p2[len - 1] = ';'; wcscpy( p2 + len, path ); @@ -587,7 +582,7 @@ static LPWSTR SHELL_BuildEnvW( const WCHAR *path ) } if (!got_path) { - wcscpy(p2, wPath); + wcscpy(p2, L"PATH="); wcscat(p2, path); p2 += wcslen(p2) + 1; } @@ -620,7 +615,7 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) if (res) { // Add ".exe" extension, if extension does not exists - if (PathAddExtensionW(buffer, wszExe)) + if (PathAddExtensionW(buffer, L".exe")) { res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp); } @@ -664,20 +659,19 @@ end: */ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classname, LPWSTR command, LONG commandlen) { - static const WCHAR wCommand[] = L"\\command"; HKEY hkeyClass; WCHAR verb[MAX_PATH]; if (RegOpenKeyExW(HKEY_CLASSES_ROOT, classname, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; - if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, sizeof(verb) / sizeof(verb[0]))) + if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, ARRAY_SIZE(verb))) return SE_ERR_NOASSOC; RegCloseKey(hkeyClass); /* Looking for ...buffer\shell\<verb>\command */ wcscat(classname, L"\\shell\\"); wcscat(classname, verb); - wcscat(classname, wCommand); + wcscat(classname, L"\\command"); if (RegQueryValueW(HKEY_CLASSES_ROOT, classname, command, &commandlen) == ERROR_SUCCESS) @@ -688,7 +682,6 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn LPWSTR tmp; WCHAR param[256]; LONG paramlen = sizeof(param); - static const WCHAR wSpace[] = {' ', 0}; /* FIXME: it seems all Windows version don't behave the same here. * the doc states that this ddeexec information can be found after @@ -697,14 +690,14 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn */ /* Get the parameters needed by the application from the associated ddeexec key */ - tmp = strstrW(classname, wCommand); + tmp = strstrW(classname, L"\\command"); tmp[0] = '\0'; wcscat(classname, wDdeexec); if (RegQueryValueW(HKEY_CLASSES_ROOT, classname, param, &paramlen) == ERROR_SUCCESS) { paramlen /= sizeof(WCHAR); - wcscat(command, wSpace); + wcscat(command, L" "); wcscat(command, param); commandlen += paramlen; } @@ -768,13 +761,13 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, return 33; } - if (SearchPathW(lpPath, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(lpPath, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; /* The file was found in the application-supplied default directory (or the system search path) */ } - else if (lpPath && SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL)) + else if (lpPath && SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL)) { TRACE("SearchPathW returned non-zero\n"); lpFile = xlpFile; @@ -817,7 +810,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, /* See if it's a program - if GetProfileString fails, we skip this * section. Actually, if GetProfileString fails, we've probably * got a lot more to worry about than running a program... */ - if (GetProfileStringW(L"windows", L"programs", L"exe pif bat cmd com", wBuffer, sizeof(wBuffer) / sizeof(WCHAR)) > 0) + if (GetProfileStringW(L"windows", L"programs", L"exe pif bat cmd com", wBuffer, ARRAY_SIZE(wBuffer)) > 0) { CharLowerW(wBuffer); tok = wBuffer; @@ -849,7 +842,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, &classnamelen) == ERROR_SUCCESS) { classnamelen /= sizeof(WCHAR); - if (classnamelen == sizeof(classname) / sizeof(WCHAR)) + if (classnamelen == ARRAY_SIZE(classname)) classnamelen--; classname[classnamelen] = '\0'; @@ -897,7 +890,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, { /* Toss the leading dot */ extension++; - if (GetProfileStringW(L"extensions", extension, L"", command, sizeof(command) / sizeof(WCHAR)) > 0) + if (GetProfileStringW(L"extensions", extension, L"", command, ARRAY_SIZE(command)) > 0) { if (wcslen(command) != 0) { @@ -966,33 +959,30 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec unsigned ret = SE_ERR_NOASSOC; BOOL unicode = !(GetVersion() & 0x80000000); - if (strlenW(key) + 1 > sizeof(regkey) / sizeof(regkey[0])) + if (strlenW(key) + 1 > ARRAY_SIZE(regkey)) { FIXME("input parameter %s larger than buffer\n", debugstr_w(key)); return 2; } wcscpy(regkey, key); - static const WCHAR wApplication[] = L"\\application"; - endkeyLen = sizeof(regkey) / sizeof(regkey[0]) - (endkey - regkey); - if (strlenW(wApplication) + 1 > endkeyLen) + endkeyLen = ARRAY_SIZE(regkey) - (endkey - regkey); + if (strlenW(L"\\application") + 1 > endkeyLen) { - FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication)); + FIXME("endkey %s overruns buffer\n", debugstr_w(L"\\application")); return 2; } - wcscpy(endkey, wApplication); + wcscpy(endkey, L"\\application"); applen = sizeof(app); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, app, &applen) != ERROR_SUCCESS) { WCHAR command[1024], fullpath[MAX_PATH]; - static const WCHAR wSo[] = L".so"; - DWORD sizeSo = sizeof(wSo) / sizeof(WCHAR); LPWSTR ptr = NULL; DWORD ret = 0; /* Get application command from start string and find filename of application */ if (*start == '"') { - if (strlenW(start + 1) + 1 > sizeof(command) / sizeof(command[0])) + if (strlenW(start + 1) + 1 > ARRAY_SIZE(command)) { FIXME("size of input parameter %s larger than buffer\n", debugstr_w(start + 1)); @@ -1001,7 +991,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec wcscpy(command, start + 1); if ((ptr = wcschr(command, '"'))) * ptr = 0; - ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr); + ret = SearchPathW(NULL, command, L".exe", ARRAY_SIZE(fullpath), fullpath, &ptr); } else { @@ -1012,11 +1002,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec int idx = space - start; memcpy(command, start, idx * sizeof(WCHAR)); command[idx] = '\0'; - if ((ret = SearchPathW(NULL, command, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr))) + if ((ret = SearchPathW(NULL, command, L".exe", ARRAY_SIZE(fullpath), fullpath, &ptr))) break; } if (!ret) - ret = SearchPathW(NULL, start, wszExe, sizeof(fullpath) / sizeof(WCHAR), fullpath, &ptr); + ret = SearchPathW(NULL, start, L".exe", ARRAY_SIZE(fullpath), fullpath, &ptr); } if (!ret) @@ -1024,7 +1014,7 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec ERR("Unable to find application path for command %s\n", debugstr_w(start)); return ERROR_ACCESS_DENIED; } - if (strlenW(ptr) + 1 > sizeof(app) / sizeof(app[0])) + if (strlenW(ptr) + 1 > ARRAY_SIZE(app)) { FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr)); return 2; @@ -1032,9 +1022,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec wcscpy(app, ptr); /* Remove extensions (including .so) */ - ptr = app + wcslen(app) - (sizeSo - 1); - if (wcslen(app) >= sizeSo && - !wcscmp(ptr, wSo)) + ptr = app + wcslen(app) - 3; + if (ptr > app && !wcscmp(ptr, L".so")) *ptr = 0; ptr = const_cast<LPWSTR>(strrchrW(app, '.')); @@ -1042,13 +1031,12 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec *ptr = 0; } - static const WCHAR wTopic[] = L"\\topic"; - if (strlenW(wTopic) + 1 > endkeyLen) + if (strlenW(L"\\topic") + 1 > endkeyLen) { - FIXME("endkey %s overruns buffer\n", debugstr_w(wTopic)); + FIXME("endkey %s overruns buffer\n", debugstr_w(L"\\topic")); return 2; } - wcscpy(endkey, wTopic); + wcscpy(endkey, L"\\topic"); topiclen = sizeof(topic); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, topic, &topiclen) != ERROR_SUCCESS) { @@ -1104,13 +1092,12 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec SetLastError(ERROR_DDE_FAIL); return 30; /* whatever */ } - static const WCHAR wIfexec[] = L"\\ifexec"; - if (strlenW(wIfexec) + 1 > endkeyLen) + if (strlenW(L"\\ifexec") + 1 > endkeyLen) { - FIXME("endkey %s overruns buffer\n", debugstr_w(wIfexec)); + FIXME("endkey %s overruns buffer\n", debugstr_w(L"\\ifexec")); return 2; } - strcpyW(endkey, wIfexec); + strcpyW(endkey, L"\\ifexec"); ifexeclen = sizeof(ifexec); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, ifexec, &ifexeclen) == ERROR_SUCCESS) { @@ -1118,8 +1105,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec } } - SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen, NULL); - if (resultLen > sizeof(static_res)/sizeof(WCHAR)) + SHELL_ArgifyW(static_res, ARRAY_SIZE(static_res), exec, lpFile, pidl, szCommandline, &resultLen, NULL); + if (resultLen > ARRAY_SIZE(static_res)) { res = dynamic_res = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, resultLen * sizeof(WCHAR))); SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL, NULL); @@ -1185,12 +1172,12 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, /* Is there a replace() function anywhere? */ cmdlen /= sizeof(WCHAR); - if (cmdlen >= sizeof(cmd) / sizeof(WCHAR)) - cmdlen = sizeof(cmd) / sizeof(WCHAR) - 1; + if (cmdlen >= ARRAY_SIZE(cmd)) + cmdlen = ARRAY_SIZE(cmd) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param) / sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen, + SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen, (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); - if (resultLen > sizeof(param) / sizeof(WCHAR)) + if (resultLen > ARRAY_SIZE(param)) ERR("Argify buffer not large enough, truncating\n"); } @@ -1277,11 +1264,11 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR if (lpDirectory) { - GetCurrentDirectoryW(sizeof(old_dir) / sizeof(WCHAR), old_dir); + GetCurrentDirectoryW(ARRAY_SIZE(old_dir), old_dir); SetCurrentDirectoryW(lpDirectory); } - retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, res, MAX_PATH, NULL, NULL, NULL, NULL); + retval = SHELL_FindExecutable(lpDirectory, lpFile, L"open", res, MAX_PATH, NULL, NULL, NULL, NULL); if (retval > 32) strcpyW(lpResult, res); @@ -1522,7 +1509,7 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) i = 0; while (1) { - r = RegEnumKeyW(hkeycm, i++, szguid, sizeof(szguid) / sizeof(szguid[0])); + r = RegEnumKeyW(hkeycm, i++, szguid, ARRAY_SIZE(szguid)); if (r != ERROR_SUCCESS) break; @@ -1569,7 +1556,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName)); wcmd[0] = '\0'; - done = SHELL_ArgifyW(wcmd, sizeof(wcmd) / sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen, + done = SHELL_ArgifyW(wcmd, ARRAY_SIZE(wcmd), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen, (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); if (!done && wszApplicationName[0]) { @@ -1583,7 +1570,7 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN else strcatW(wcmd, wszApplicationName); } - if (resultLen > sizeof(wcmd) / sizeof(WCHAR)) + if (resultLen > ARRAY_SIZE(wcmd)) ERR("Argify buffer not large enough... truncating\n"); return execfunc(wcmd, NULL, FALSE, psei, psei_out); } @@ -1603,22 +1590,21 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen) { - static const WCHAR wExplorer[] = L"explorer.exe"; WCHAR buffer[MAX_PATH]; BOOL appKnownSingular = FALSE; /* last chance to translate IDList: now also allow CLSID paths */ - if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW((LPCITEMIDLIST)sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) { + if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW((LPCITEMIDLIST)sei->lpIDList, buffer, ARRAY_SIZE(buffer)))) { if (buffer[0] == ':' && buffer[1] == ':') { /* open shell folder for the specified class GUID */ if (strlenW(buffer) + 1 > parametersLen) ERR("parameters len exceeds buffer size (%i > %i), truncating\n", lstrlenW(buffer) + 1, parametersLen); lstrcpynW(wszParameters, buffer, parametersLen); - if (strlenW(wExplorer) > dwApplicationNameLen) - ERR("application len exceeds buffer size (%i > %i), truncating\n", - lstrlenW(wExplorer) + 1, dwApplicationNameLen); - lstrcpynW(wszApplicationName, wExplorer, dwApplicationNameLen); + if (strlenW(L"explorer.exe") > dwApplicationNameLen) + ERR("application len exceeds buffer size (%i), truncating\n", + dwApplicationNameLen); + lstrcpynW(wszApplicationName, L"explorer.exe", dwApplicationNameLen); appKnownSingular = TRUE; sei->fMask &= ~SEE_MASK_INVOKEIDLIST; @@ -1686,8 +1672,6 @@ static UINT_PTR SHELL_quote_and_execute(LPCWSTR wcmd, LPCWSTR wszParameters, LPC static UINT_PTR SHELL_execute_url(LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc) { - static const WCHAR wShell[] = L"\\shell\\"; - static const WCHAR wCommand[] = L"\\command"; UINT_PTR retval; WCHAR *lpstrProtocol; LPCWSTR lpstrRes; @@ -1702,17 +1686,17 @@ static UINT_PTR SHELL_execute_url(LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEIN TRACE("Got URL: %s\n", debugstr_w(lpFile)); /* Looking for ...<protocol>\shell\<lpVerb>\command */ - len = iSize + lstrlenW(wShell) + lstrlenW(wCommand) + 1; + len = iSize + lstrlenW(L"\\shell\\") + lstrlenW(L"\\command") + 1; if (psei->lpVerb && *psei->lpVerb) len += lstrlenW(psei->lpVerb); else - len += lstrlenW(wszOpen); + len += lstrlenW(L"open"); lpstrProtocol = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); memcpy(lpstrProtocol, lpFile, iSize * sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; - strcatW(lpstrProtocol, wShell); - strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb : wszOpen); - strcatW(lpstrProtocol, wCommand); + strcatW(lpstrProtocol, L"\\shell\\"); + strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb : L"open"); + strcatW(lpstrProtocol, L"\\command"); retval = execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, wcmd, execfunc, psei, psei_out); @@ -1728,14 +1712,14 @@ static void do_error_dialog(UINT_PTR retval, HWND hwnd, WCHAR* filename) error_code = GetLastError(); if (retval == SE_ERR_NOASSOC) - LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg) / sizeof(WCHAR)); + LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, ARRAY_SIZE(msg)); else FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error_code, LANG_USER_DEFAULT, msg, - sizeof(msg) / sizeof(WCHAR), + ARRAY_SIZE(msg), (va_list*)msgArguments); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); @@ -1774,9 +1758,9 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; DWORD dwApplicationNameLen = MAX_PATH + 2; - DWORD parametersLen = sizeof(parametersBuffer) / sizeof(WCHAR); - DWORD dirLen = sizeof(dirBuffer) / sizeof(WCHAR); - DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); + DWORD parametersLen = ARRAY_SIZE(parametersBuffer); + DWORD dirLen = ARRAY_SIZE(dirBuffer); + DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ WCHAR wfileName[MAX_PATH]; @@ -2112,7 +2096,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if (lpQuotedFile) { retval = SHELL_FindExecutable(sei_tmp.lpDirectory, L"explorer", - wszOpen, wExec, MAX_PATH, + L"open", wExec, MAX_PATH, NULL, &env, NULL, NULL); if (retval > 32) { @@ -2480,20 +2464,20 @@ HRESULT WINAPI ShellExecCmdLine( StringCchCopyW(szFile, _countof(szFile), szFile2); } else if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszCom, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, L".exe", _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, L".com", _countof(szFile2), szFile2, NULL) || SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) + SearchPathW(pwszStartDir, szFile, L".exe", _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, L".com", _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); } else if (SearchPathW(NULL, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, lpCommand, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, lpCommand, wszCom, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, lpCommand, L".exe", _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, lpCommand, L".com", _countof(szFile2), szFile2, NULL) || SearchPathW(pwszStartDir, lpCommand, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, lpCommand, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, lpCommand, wszCom, _countof(szFile2), szFile2, NULL)) + SearchPathW(pwszStartDir, lpCommand, L".exe", _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, lpCommand, L".com", _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); pchParams = NULL; diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 59aa0cf2b09..fbd06a767b8 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -35,9 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define NEW_FILENAME_ON_COPY_TRIES 100 -static const WCHAR wWildcardFile[] = {'*',0}; -static const WCHAR wWildcardChars[] = {'*','?',0}; - typedef struct { SHFILEOPSTRUCTW *req; @@ -87,8 +84,6 @@ static BOOL _FileOpCount(FILE_OPERATION *op, LPWSTR pwszBuf, BOOL bFolder, DWORD /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations */ -static const WCHAR CONFIRM_MSG_PROP[] = {'W','I','N','E','_','C','O','N','F','I','R','M',0}; - struct confirm_msg_info { LPWSTR lpszText; @@ -139,7 +134,7 @@ static INT_PTR ConfirmMsgBox_Paint(HWND hDlg) /* this will remap the rect to dialog coords */ MapWindowPoints(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), hDlg, (LPPOINT)&r, 2); hOldFont = (HFONT)SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDC_YESTOALL_MESSAGE, WM_GETFONT, 0, 0)); - DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); + DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, L"WINE_CONFIRM"), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); SelectObject(hdc, hOldFont); EndPaint(hDlg, &ps); @@ -157,7 +152,7 @@ static INT_PTR ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) SetWindowTextW(hDlg, info->lpszCaption); ShowWindow(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), SW_HIDE); - SetPropW(hDlg, CONFIRM_MSG_PROP, info->lpszText); + SetPropW(hDlg, L"WINE_CONFIRM", info->lpszText); SendDlgItemMessageW(hDlg, IDC_YESTOALL_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); /* compute the text height and resize the dialog */ @@ -379,7 +374,7 @@ BOOL SHELL_DeleteDirectoryW(FILE_OPERATION *op, LPCWSTR pszDir, BOOL bShowUI) WCHAR szTemp[MAX_PATH]; /* Make sure the directory exists before eventually prompting the user */ - PathCombineW(szTemp, pszDir, wWildcardFile); + PathCombineW(szTemp, pszDir, L"*"); hFind = FindFirstFileW(szTemp, &wfd); if (hFind == INVALID_HANDLE_VALUE) return FALSE; @@ -960,7 +955,7 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) { WIN32_FIND_DATAW wfd; - BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, wWildcardChars)); + BOOL b_FileMask = fileOnly && (NULL != StrPBrkW(pName, L"*?")); DWORD dwAttr = INVALID_FILE_ATTRIBUTES; HANDLE hFind = FindFirstFileW(pName, &wfd); @@ -1238,7 +1233,7 @@ static HRESULT parse_file_list(FILE_LIST *flList, LPCWSTR szFiles) } /* parse wildcard files if they are in the filename */ - if (StrPBrkW(szCurFile, wWildcardChars)) + if (StrPBrkW(szCurFile, L"*?")) { parse_wildcard_files(flList, szCurFile, &i); flList->bAnyFromWildcard = TRUE; @@ -1318,8 +1313,6 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; FILE_LIST flFromNew, flToNew; - static const WCHAR wildCardFiles[] = {'*','.','*',0}; - if (IsDotDir(feFrom->szFilename)) return; @@ -1364,7 +1357,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST szTo[lstrlenW(szTo) + 1] = '\0'; SHNotifyCreateDirectoryW(szTo, NULL); - PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); + PathCombineW(szFrom, feFrom->szFullPath, L"*.*"); szFrom[lstrlenW(szFrom) + 1] = '\0'; ZeroMemory(&flFromNew, sizeof(FILE_LIST)); @@ -1582,9 +1575,8 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE if (flFrom->dwNumFiles > 1) { WCHAR tmp[8]; - const WCHAR format[] = {'%','d',0}; - wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); + wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), L"%d", flFrom->dwNumFiles); return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp, NULL); } else @@ -1704,14 +1696,12 @@ static void move_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; FILE_LIST flFromNew, flToNew; - static const WCHAR wildCardFiles[] = {'*','.','*',0}; - if (IsDotDir(feFrom->szFilename)) return; SHNotifyCreateDirectoryW(szDestPath, NULL); - PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); + PathCombineW(szFrom, feFrom->szFullPath, L"*.*"); szFrom[lstrlenW(szFrom) + 1] = '\0'; lstrcpyW(szTo, szDestPath); diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index 84c7c63a5f0..17a0236b944 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -117,12 +117,6 @@ static void FillTreeView(browse_info*, LPSHELLFOLDER, static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *, LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); -static const WCHAR szBrowseFolderInfo[] = { - '_','_','W','I','N','E','_', - 'B','R','S','F','O','L','D','E','R','D','L','G','_', - 'I','N','F','O',0 -}; - static inline DWORD BrowseFlagsToSHCONTF(UINT ulFlags) { return SHCONTF_FOLDERS | (ulFlags & BIF_BROWSEINCLUDEFILES ? SHCONTF_NONFOLDERS : 0); @@ -772,7 +766,7 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; info->hWnd = hWnd; - SetPropW( hWnd, szBrowseFolderInfo, info ); + SetPropW( hWnd, L"__WINE_BRSFOLDERDLG_INFO", info ); if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) FIXME("flags BIF_NEWDIALOGSTYLE partially implemented\n"); @@ -1285,7 +1279,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, if (msg == WM_INITDIALOG) return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); - info = GetPropW( hWnd, szBrowseFolderInfo ); + info = GetPropW( hWnd, L"__WINE_BRSFOLDERDLG_INFO" ); switch (msg) { @@ -1348,13 +1342,6 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, return FALSE; } -#ifndef __REACTOS__ -static const WCHAR swBrowseTemplateName[] = { - 'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; -static const WCHAR swNewBrowseTemplateName[] = { - 'S','H','N','E','W','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; -#endif - /************************************************************************* * SHBrowseForFolderA [SHELL32.@] * SHBrowseForFolder [SHELL32.@] diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c index b2a5ca54256..df2099914da 100644 --- a/dll/win32/shell32/wine/classes.c +++ b/dll/win32/shell32/wine/classes.c @@ -127,10 +127,6 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP return TRUE; } -static const WCHAR swShell[] = {'s','h','e','l','l','\\',0}; -static const WCHAR swOpen[] = {'o','p','e','n',0}; -static const WCHAR swCommand[] = {'\\','c','o','m','m','a','n','d',0}; - BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) { WCHAR sTemp[MAX_PATH]; @@ -147,12 +143,12 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l size=len; *szDest='\0'; - if (!RegQueryValueW(hkeyClass, swShell, szDest, &size) && *szDest) + if (!RegQueryValueW(hkeyClass, L"shell\\", szDest, &size) && *szDest) { /* The MSDN says to first try the default verb */ - lstrcpyW(sTemp, swShell); + lstrcpyW(sTemp, L"shell\\"); lstrcatW(sTemp, szDest); - lstrcatW(sTemp, swCommand); + lstrcatW(sTemp, L"\\command"); if (!RegOpenKeyExW(hkeyClass, sTemp, 0, KEY_READ, &hkey)) { RegCloseKey(hkey); @@ -162,13 +158,11 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l } /* then fallback to 'open' */ - lstrcpyW(sTemp, swShell); - lstrcatW(sTemp, swOpen); - lstrcatW(sTemp, swCommand); + lstrcpyW(sTemp, L"shell\\open\\command"); if (!RegOpenKeyExW(hkeyClass, sTemp, 0, KEY_READ, &hkey)) { RegCloseKey(hkey); - lstrcpynW(szDest, swOpen, len); + lstrcpynW(szDest, L"open", len); TRACE("default verb=open\n"); return TRUE; } @@ -213,9 +207,9 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, sizeof(sTempVerb)/sizeof(sTempVerb[0]))) { WCHAR sTemp[MAX_PATH]; - lstrcpyW(sTemp, swShell); + lstrcpyW(sTemp, L"shell\\"); lstrcatW(sTemp, sTempVerb); - lstrcatW(sTemp, swCommand); + lstrcatW(sTemp, L"\\command"); ret = (ERROR_SUCCESS == SHGetValueW(hkeyClass, sTemp, NULL, NULL, szDest, &len)); } if (szClass) @@ -293,7 +287,6 @@ static BOOL HCR_RegGetIconA(HKEY hkey, LPSTR szDest, LPCSTR szName, DWORD len, i BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int* picon_idx) { - static const WCHAR swDefaultIcon[] = {'\\','D','e','f','a','u','l','t','I','c','o','n',0}; HKEY hkey; WCHAR sTemp[MAX_PATH]; BOOL ret = FALSE; @@ -301,7 +294,7 @@ BOOL HCR_GetIconW(LPCWSTR szClass, LPWSTR szDest, LPCWSTR szName, DWORD len, int TRACE("%s\n",debugstr_w(szClass) ); lstrcpynW(sTemp, szClass, MAX_PATH); - lstrcatW(sTemp, swDefaultIcon); + lstrcatW(sTemp, L"\\DefaultIcon"); if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, sTemp, 0, KEY_READ, &hkey)) { @@ -346,8 +339,6 @@ BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* p * * Gets the name of a registered class */ -static const WCHAR swEmpty[] = {0}; - BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) { HKEY hkey; @@ -376,10 +367,8 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len) if (HCR_RegOpenClassIDKey(riid, &hkey)) #endif { - static const WCHAR wszLocalizedString[] = - { 'L','o','c','a','l','i','z','e','d','S','t','r','i','n','g', 0 }; - if (!RegLoadMUIStringW(hkey, wszLocalizedString, szDest, len, NULL, 0, NULL) || - !RegQueryValueExW(hkey, swEmpty, 0, NULL, (LPBYTE)szDest, &len)) + if (!RegLoadMUIStringW(hkey, L"LocalizedString", szDest, len, NULL, 0, NULL) || + !RegQueryValueExW(hkey, L"", 0, NULL, (LPBYTE)szDest, &len)) { ret = TRUE; } @@ -524,12 +513,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) LPOLESTR pwszCLSID; LONG lResult; DWORD dwTemp, dwLen; - static const WCHAR wszAttributes[] = { 'A','t','t','r','i','b','u','t','e','s',0 }; - static const WCHAR wszCallForAttributes[] = { - 'C','a','l','l','F','o','r','A','t','t','r','i','b','u','t','e','s',0 }; - WCHAR wszShellFolderKey[] = { 'C','L','S','I','D','\\','{','0','0','0','2','1','4','0','0','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-','0','0','0','0','0','0','0', - '0','0','0','4','6','}','\\','S','h','e','l','l','F','o','l','d','e','r',0 }; + WCHAR wszShellFolderKey[] = L"CLSID\\{00021400-0000-0000-C000-000000000046}\\ShellFolder"; TRACE("(pidlFolder=%p, pdwAttributes=%p)\n", pidlFolder, pdwAttributes); @@ -560,7 +544,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) #endif dwLen = sizeof(DWORD); - lResult = RegQueryValueExW(hSFKey, wszCallForAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); + lResult = RegQueryValueExW(hSFKey, L"CallForAttributes", 0, NULL, (LPBYTE)&dwTemp, &dwLen); if ((lResult == ERROR_SUCCESS) && (dwTemp & *pdwAttributes)) { LPSHELLFOLDER psfDesktop, psfFolder; HRESULT hr; @@ -578,7 +562,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) } if (FAILED(hr)) return FALSE; } else { - lResult = RegQueryValueExW(hSFKey, wszAttributes, 0, NULL, (LPBYTE)&dwTemp, &dwLen); + lResult = RegQueryValueExW(hSFKey, L"Attributes", 0, NULL, (LPBYTE)&dwTemp, &dwLen); RegCloseKey(hSFKey); if (lResult == ERROR_SUCCESS) { *pdwAttributes &= dwTemp; diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 9e8852c3a25..34c7b3bcf5b 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -697,20 +697,17 @@ static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_ static void Control_DoWindow(CPanel* panel, HWND hWnd, HINSTANCE hInst) { + static const WCHAR wszRegPath[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"; HANDLE h; WIN32_FIND_DATAW fd; WCHAR buffer[MAX_PATH]; - static const WCHAR wszAllCpl[] = {'*','.','c','p','l',0}; - static const WCHAR wszRegPath[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', - '\\','C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','C','p','l','s',0}; WCHAR *p; /* first add .cpl files in the system directory */ GetSystemDirectoryW( buffer, MAX_PATH ); p = buffer + strlenW(buffer); *p++ = '\\'; - lstrcpyW(p, wszAllCpl); + lstrcpyW(p, L"*.cpl"); if ((h = FindFirstFileW(buffer, &fd)) != INVALID_HANDLE_VALUE) { do { diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 616356c00b1..b31dedcba2c 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -557,10 +557,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get the type name */ if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME)) { - static const WCHAR szFolder[] = { 'F','o','l','d','e','r',0 }; - static const WCHAR szFile[] = { 'F','i','l','e',0 }; - static const WCHAR szSpaceFile[] = { ' ','f','i','l','e',0 }; - if (!(flags & SHGFI_USEFILEATTRIBUTES) || (flags & SHGFI_PIDL)) { char ftype[80]; @@ -571,7 +567,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - strcatW (psfi->szTypeName, szFolder); + strcatW (psfi->szTypeName, L"Folder"); else { WCHAR sTemp[64]; @@ -580,7 +576,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (sTemp[0] == 0 || (sTemp[0] == '.' && sTemp[1] == 0)) { /* "name" or "name." => "File" */ - lstrcpynW (psfi->szTypeName, szFile, 64); + lstrcpynW (psfi->szTypeName, L"File", 64); } else if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) && HCR_MapTypeToValueW(sTemp, psfi->szTypeName, 80, FALSE ))) @@ -588,11 +584,11 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (sTemp[0]) { lstrcpynW (psfi->szTypeName, sTemp, 64); - strcatW (psfi->szTypeName, szSpaceFile); + strcatW (psfi->szTypeName, L" file"); } else { - lstrcpynW (psfi->szTypeName, szFile, 64); + lstrcpynW (psfi->szTypeName, L"File", 64); } } } @@ -639,7 +635,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { WCHAR* szExt; - static const WCHAR p1W[] = {'%','1',0}; WCHAR sTemp [MAX_PATH]; szExt = PathFindExtensionW(szFullPath); @@ -648,7 +643,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &psfi->iIcon)) { - if (lstrcmpW(p1W, sTemp)) + if (lstrcmpW(L"%1", sTemp)) strcpyW(psfi->szDisplayName, sTemp); else { @@ -697,15 +692,13 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0); else { - static const WCHAR p1W[] = {'%','1',0}; - psfi->iIcon = 0; szExt = PathFindExtensionW(sTemp); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_GetIconW(sTemp, sTemp, NULL, MAX_PATH, &icon_idx)) { - if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ + if (!lstrcmpW(L"%1",sTemp)) /* icon is in the file */ strcpyW(sTemp, szFullPath); if (flags & SHGFI_SYSICONINDEX) @@ -1138,12 +1131,14 @@ INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM */ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { +#ifdef __REACTOS__ + static DWORD cxLogoBmp; static DWORD cyLogoBmp, cyLineBmp; static HBITMAP hLogoBmp, hLineBmp; static HWND hWndAuthors; - switch(msg) + switch (msg) { case WM_INITDIALOG: { @@ -1151,7 +1146,6 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM if (info) { - const WCHAR szRegKey[] = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"; HKEY hRegKey; MEMORYSTATUSEX MemStat; WCHAR szAppTitle[512]; @@ -1171,51 +1165,49 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM } hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if(hLogoBmp && hLineBmp) + if (hLogoBmp && hLineBmp) { BITMAP bmpLogo; - GetObject( hLogoBmp, sizeof(BITMAP), &bmpLogo ); + GetObject(hLogoBmp, sizeof(BITMAP), &bmpLogo); cxLogoBmp = bmpLogo.bmWidth; cyLogoBmp = bmpLogo.bmHeight; - GetObject( hLineBmp, sizeof(BITMAP), &bmpLogo ); + GetObject(hLineBmp, sizeof(BITMAP), &bmpLogo); cyLineBmp = bmpLogo.bmHeight; } // Set App-specific stuff (icon, app name, szOtherStuff string) SendDlgItemMessageW(hWnd, IDC_ABOUT_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); - GetWindowTextW( hWnd, szAppTitleTemplate, sizeof(szAppTitleTemplate) / sizeof(WCHAR) ); - swprintf( szAppTitle, szAppTitleTemplate, info->szApp ); - SetWindowTextW( hWnd, szAppTitle ); + GetWindowTextW(hWnd, szAppTitleTemplate, ARRAY_SIZE(szAppTitleTemplate)); + swprintf(szAppTitle, szAppTitleTemplate, info->szApp); + SetWindowTextW(hWnd, szAppTitle); - SetDlgItemTextW( hWnd, IDC_ABOUT_APPNAME, info->szApp ); -#ifdef __REACTOS__ - SetDlgItemTextW( hWnd, IDC_ABOUT_VERSION, info->szOSVersion ); -#endif - SetDlgItemTextW( hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff ); + SetDlgItemTextW(hWnd, IDC_ABOUT_APPNAME, info->szApp); + SetDlgItemTextW(hWnd, IDC_ABOUT_VERSION, info->szOSVersion); + SetDlgItemTextW(hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff); // Set the registered user and organization name - if(RegOpenKeyExW( HKEY_LOCAL_MACHINE, szRegKey, 0, KEY_QUERY_VALUE, &hRegKey ) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) { - SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME ); - SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME ); -#ifdef __REACTOS__ - if(GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_USERNAME ) ) == 0 && - GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_ORGNAME ) ) == 0) + SetRegTextData(hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME); + SetRegTextData(hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME); + + if (GetWindowTextLengthW(GetDlgItem(hWnd, IDC_ABOUT_REG_USERNAME)) == 0 && + GetWindowTextLengthW(GetDlgItem(hWnd, IDC_ABOUT_REG_ORGNAME)) == 0) { - ShowWindow( GetDlgItem( hWnd, IDC_ABOUT_REG_TO ), SW_HIDE ); + ShowWindow(GetDlgItem(hWnd, IDC_ABOUT_REG_TO), SW_HIDE); } -#endif - RegCloseKey( hRegKey ); + RegCloseKey(hRegKey); } // Set the value for the installed physical memory MemStat.dwLength = sizeof(MemStat); - if( GlobalMemoryStatusEx(&MemStat) ) + if (GlobalMemoryStatusEx(&MemStat)) { WCHAR szBuf[12]; @@ -1239,24 +1231,24 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM MemStat.ullTotalPhys /= 1024; dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - wcscpy( szUnits, L"PB" ); + wcscpy(szUnits, L"PB"); } else { dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - wcscpy( szUnits, L"TB" ); + wcscpy(szUnits, L"TB"); } } else { dTotalPhys = (double)MemStat.ullTotalPhys / 1024; - wcscpy( szUnits, L"GB" ); + wcscpy(szUnits, L"GB"); } // We need the decimal point of the current locale to display the RAM size correctly if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, - sizeof(szDecimalSeparator) / sizeof(WCHAR)) > 0) + ARRAY_SIZE(szDecimalSeparator)) > 0) { UCHAR uDecimals; UINT uIntegral; @@ -1271,16 +1263,16 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM else { // We're dealing with MBs, don't show any decimals - swprintf( szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys / 1024 / 1024 ); + swprintf(szBuf, L"%u MB", (UINT)MemStat.ullTotalPhys / 1024 / 1024); } - SetDlgItemTextW( hWnd, IDC_ABOUT_PHYSMEM, szBuf); + SetDlgItemTextW(hWnd, IDC_ABOUT_PHYSMEM, szBuf); } // Add the Authors dialog - hWndAuthors = CreateDialogW( shell32_hInstance, MAKEINTRESOURCEW(IDD_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc ); - LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); - SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText ); + hWndAuthors = CreateDialogW(shell32_hInstance, MAKEINTRESOURCEW(IDD_ABOUT_AUTHORS), hWnd, AboutAuthorsDlgProc); + LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, ARRAY_SIZE(szAuthorsText)); + SetDlgItemTextW(hWnd, IDC_ABOUT_AUTHORS, szAuthorsText); } return TRUE; @@ -1288,7 +1280,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM case WM_PAINT: { - if(hLogoBmp && hLineBmp) + if (hLogoBmp && hLineBmp) { PAINTSTRUCT ps; HDC hdc; @@ -1298,7 +1290,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM hdc = BeginPaint(hWnd, &ps); hdcMem = CreateCompatibleDC(hdc); - if(hdcMem) + if (hdcMem) { hOldObj = SelectObject(hdcMem, hLogoBmp); BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, SRCCOPY); @@ -1312,7 +1304,8 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM EndPaint(hWnd, &ps); } - }; break; + break; + } case WM_COMMAND: { @@ -1328,29 +1321,32 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM static BOOL bShowingAuthors = FALSE; WCHAR szAuthorsText[20]; - if(bShowingAuthors) + if (bShowingAuthors) { - LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); - ShowWindow( hWndAuthors, SW_HIDE ); + LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_AUTHORS, szAuthorsText, ARRAY_SIZE(szAuthorsText)); + ShowWindow(hWndAuthors, SW_HIDE); } else { - LoadStringW( shell32_hInstance, IDS_SHELL_ABOUT_BACK, szAuthorsText, sizeof(szAuthorsText) / sizeof(WCHAR) ); - ShowWindow( hWndAuthors, SW_SHOW ); + LoadStringW(shell32_hInstance, IDS_SHELL_ABOUT_BACK, szAuthorsText, ARRAY_SIZE(szAuthorsText)); + ShowWindow(hWndAuthors, SW_SHOW); } - SetDlgItemTextW( hWnd, IDC_ABOUT_AUTHORS, szAuthorsText ); + SetDlgItemTextW(hWnd, IDC_ABOUT_AUTHORS, szAuthorsText); bShowingAuthors = !bShowingAuthors; return TRUE; } } - }; break; + break; + } case WM_CLOSE: EndDialog(hWnd, TRUE); break; } +#endif // __REACTOS__ + return 0; } diff --git a/dll/win32/shell32/wine/shellole.c b/dll/win32/shell32/wine/shellole.c index ae9a39bb8fa..6ede109f92e 100644 --- a/dll/win32/shell32/wine/shellole.c +++ b/dll/win32/shell32/wine/shellole.c @@ -113,10 +113,7 @@ HRESULT WINAPI SHCoCreateInstance( CLSID iid; const CLSID * myclsid = clsid; WCHAR sKeyName[MAX_PATH]; - static const WCHAR sCLSID[] = {'C','L','S','I','D','\\','\0'}; WCHAR sClassID[60]; - static const WCHAR sInProcServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2','\0'}; - static const WCHAR sLoadWithoutCOM[] = {'L','o','a','d','W','i','t','h','o','u','t','C','O','M','\0'}; WCHAR sDllPath[MAX_PATH]; HKEY hKey = 0; DWORD dwSize; @@ -144,16 +141,14 @@ HRESULT WINAPI SHCoCreateInstance( } /* we look up the dll path in the registry */ - SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR)); - lstrcpyW(sKeyName, sCLSID); - lstrcatW(sKeyName, sClassID); - lstrcatW(sKeyName, sInProcServer32); + SHStringFromGUIDW(myclsid, sClassID, ARRAY_SIZE(sClassID)); + swprintf(sKeyName, L"CLSID\\%s\\InprocServer32", sClassID); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, sKeyName, 0, KEY_READ, &hKey)) return E_ACCESSDENIED; /* if a special registry key is set, we load a shell extension without help of OLE32 */ - if (!SHQueryValueExW(hKey, sLoadWithoutCOM, 0, 0, 0, 0)) + if (!SHQueryValueExW(hKey, L"LoadWithoutCOM", 0, 0, 0, 0)) { /* load an external dll without ole32 */ HANDLE hLibrary; diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 0b3965711c2..fde33759c2a 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -809,7 +809,6 @@ static INT SHADD_create_add_mru_data(HANDLE mruhandle, LPCSTR doc_name, LPCSTR n void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) { #ifdef __REACTOS__ - static const WCHAR szExplorerKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer"; INT ret; WCHAR szTargetPath[MAX_PATH], szLinkDir[MAX_PATH], szLinkFile[MAX_PATH], szDescription[80]; WCHAR szPath[MAX_PATH]; @@ -884,7 +883,8 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) TRACE("Users Recent dir %S\n", szLinkDir); /* open Explorer key */ - error = RegCreateKeyExW(HKEY_CURRENT_USER, szExplorerKey, 0, NULL, 0, + error = RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hExplorerKey, NULL); if (error) { @@ -1613,17 +1613,6 @@ BOOL WINAPI DAD_ShowDragImage(BOOL bShow) return FALSE; } -static const WCHAR szwCabLocation[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r','\\', - 'C','a','b','i','n','e','t','S','t','a','t','e',0 -}; - -static const WCHAR szwSettings[] = { 'S','e','t','t','i','n','g','s',0 }; - /************************************************************************* * ReadCabinetState [SHELL32.651] NT 4.0 * @@ -1638,11 +1627,11 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length) if( (cs == NULL) || (length < (int)sizeof(*cs)) ) return FALSE; - r = RegOpenKeyW( HKEY_CURRENT_USER, szwCabLocation, &hkey ); + r = RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &hkey ); if( r == ERROR_SUCCESS ) { type = REG_BINARY; - r = RegQueryValueExW( hkey, szwSettings, + r = RegQueryValueExW( hkey, L"Settings", NULL, &type, (LPBYTE)cs, (LPDWORD)&length ); RegCloseKey( hkey ); @@ -1685,11 +1674,11 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *cs) if( cs == NULL ) return FALSE; - r = RegCreateKeyExW( HKEY_CURRENT_USER, szwCabLocation, 0, + r = RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); if( r == ERROR_SUCCESS ) { - r = RegSetValueExW( hkey, szwSettings, 0, + r = RegSetValueExW( hkey, L"Settings", 0, REG_BINARY, (LPBYTE) cs, cs->cLength); RegCloseKey( hkey ); @@ -2021,7 +2010,6 @@ HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_if */ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, LPDATAOBJECT pDataObj) { - static const WCHAR szPropSheetSubKey[] = {'s','h','e','l','l','e','x','\\','P','r','o','p','e','r','t','y','S','h','e','e','t','H','a','n','d','l','e','r','s',0}; WCHAR szHandler[64]; DWORD dwHandlerLen; WCHAR szClsidHandler[39]; @@ -2044,7 +2032,7 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ if (lRet != ERROR_SUCCESS) return NULL; - lRet = RegOpenKeyExW(hkBase, szPropSheetSubKey, 0, KEY_ENUMERATE_SUB_KEYS, &hkPropSheetHandlers); + lRet = RegOpenKeyExW(hkBase, L"shellex\\PropertySheetHandlers", 0, KEY_ENUMERATE_SUB_KEYS, &hkPropSheetHandlers); RegCloseKey(hkBase); if (lRet == ERROR_SUCCESS) { @@ -2316,8 +2304,6 @@ BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, const WCHAR *basename; WCHAR *dst_basename; int i=2; - static const WCHAR lnkformat[] = {'%','s','.','l','n','k',0}; - static const WCHAR lnkformatnum[] = {'%','s',' ','(','%','d',')','.','l','n','k',0}; TRACE("(%s, %s, %p, %p, 0x%08x)\n", debugstr_w(pszLinkTo), debugstr_w(pszDir), pszName, pfMustCopy, uFlags); @@ -2349,11 +2335,11 @@ BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, dst_basename = pszName + strlenW(pszName); - snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, lnkformat, basename); + snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, L"%s.lnk", basename); while (GetFileAttributesW(pszName) != INVALID_FILE_ATTRIBUTES) { - snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, lnkformatnum, basename, i); + snprintfW(dst_basename, pszName + MAX_PATH - dst_basename, L"%s (%d).lnk", basename, i); i++; } diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index 7745285af6e..736092b20a5 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -58,6 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); static const BOOL is_win64 = sizeof(void *) > sizeof(int); #ifdef __REACTOS__ + /* FIXME: Remove this */ typedef enum _NT_PRODUCT_TYPE { @@ -70,7 +71,6 @@ typedef enum _NT_PRODUCT_TYPE static BOOL DoGetProductType(PNT_PRODUCT_TYPE ProductType) { - static const WCHAR ProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; HKEY hKey; LONG error; WCHAR szValue[9]; @@ -85,7 +85,7 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) *ProductType = NtProductServer; - error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProductOptions, 0, KEY_READ, &hKey); + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_READ, &hKey); if (error) return FALSE; @@ -104,7 +104,9 @@ DoGetProductType(PNT_PRODUCT_TYPE ProductType) RegCloseKey(hKey); return TRUE; } -#endif + +#endif // __REACTOS__ + /* ########## Combining and Constructing paths ########## */ @@ -370,14 +372,12 @@ BOOL PathIsExeW (LPCWSTR lpszPath) LPCWSTR lpszExtension = PathGetExtensionW(lpszPath); int i; static const WCHAR lpszExtensions[][4] = - {{'e','x','e','\0'}, {'c','o','m','\0'}, {'p','i','f','\0'}, - {'c','m','d','\0'}, {'b','a','t','\0'}, {'s','c','f','\0'}, - {'s','c','r','\0'}, {'\0'} }; + {L"exe", L"com", L"pif", L"cmd", L"bat", L"scf", L"scr", L"" }; TRACE("path=%s\n",debugstr_w(lpszPath)); for(i=0; lpszExtensions[i][0]; i++) - if (!strcmpiW(lpszExtension,lpszExtensions[i])) return TRUE; + if (!wcsicmp(lpszExtension,lpszExtensions[i])) return TRUE; return FALSE; } @@ -507,9 +507,7 @@ BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR buffer, LPCWSTR path, LPCWSTR sh /* now try to make it unique */ while (PathFileExistsW(retW)) { - static const WCHAR fmtW[] = {'%','s',' ','(','%','d',')','%','s',0}; - - sprintfW(retW, fmtW, pathW, i, ext); + sprintfW(retW, L"%s (%d)%s", pathW, i, ext); i++; } @@ -813,125 +811,28 @@ LONG WINAPI PathProcessCommandAW ( ########## special ########## */ -static const WCHAR szCurrentVersion[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'}; -static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; -static const WCHAR AppDataW[] = {'A','p','p','D','a','t','a','\0'}; -#ifndef __REACTOS__ -static const WCHAR AppData_LocalLowW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','L','o','w','\0'}; -static const WCHAR Application_DataW[] = {'A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'}; -#endif -static const WCHAR CacheW[] = {'C','a','c','h','e','\0'}; -static const WCHAR CD_BurningW[] = {'C','D',' ','B','u','r','n','i','n','g','\0'}; -static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' ','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; -static const WCHAR Common_AppDataW[] = {'C','o','m','m','o','n',' ','A','p','p','D','a','t','a','\0'}; -static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s','k','t','o','p','\0'}; -static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'}; -static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'}; -static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'}; -static const WCHAR CommonFilesDirX86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; -static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'}; -static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR Common_ProgramsW[] = {'C','o','m','m','o','n',' ','P','r','o','g','r','a','m','s','\0'}; -static const WCHAR Common_StartUpW[] = {'C','o','m','m','o','n',' ','S','t','a','r','t','U','p','\0'}; -static const WCHAR Common_Start_MenuW[] = {'C','o','m','m','o','n',' ','S','t','a','r','t',' ','M','e','n','u','\0'}; -static const WCHAR Common_TemplatesW[] = {'C','o','m','m','o','n',' ','T','e','m','p','l','a','t','e','s','\0'}; -static const WCHAR CommonVideoW[] = {'C','o','m','m','o','n','V','i','d','e','o','\0'}; -#ifndef __REACTOS__ -static const WCHAR ContactsW[] = {'C','o','n','t','a','c','t','s','\0'}; -#endif -static const WCHAR CookiesW[] = {'C','o','o','k','i','e','s','\0'}; -static const WCHAR DesktopW[] = {'D','e','s','k','t','o','p','\0'}; -#ifndef __REACTOS__ -static const WCHAR DocumentsW[] = {'D','o','c','u','m','e','n','t','s','\0'}; -static const WCHAR DownloadsW[] = {'D','o','w','n','l','o','a','d','s','\0'}; -#endif -static const WCHAR FavoritesW[] = {'F','a','v','o','r','i','t','e','s','\0'}; -static const WCHAR FontsW[] = {'F','o','n','t','s','\0'}; -static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'}; -#ifndef __REACTOS__ -static const WCHAR LinksW[] = {'L','i','n','k','s','\0'}; -#endif -static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; -#ifndef __REACTOS__ -static const WCHAR Local_Settings_Application_DataW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'}; -#endif -static const WCHAR Local_Settings_CD_BurningW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\\','M','i','c','r','o','s','o','f','t','\\','C','D',' ','B','u','r','n','i','n','g','\0'}; -#ifndef __REACTOS__ -static const WCHAR Local_Settings_HistoryW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','H','i','s','t','o','r','y','\0'}; -static const WCHAR Local_Settings_Temporary_Internet_FilesW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s','\0'}; -static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p','l','o','r','e','r','\0'}; -static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'}; -static const WCHAR Microsoft_Windows_RingtonesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','i','n','g','t','o','n','e','s','\0'}; -static const WCHAR MusicW[] = {'M','u','s','i','c','\0'}; -static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'}; -static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'}; -static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'}; -#endif -static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; -static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','\0'}; -static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; -static const WCHAR OEM_LinksW[] = {'O','E','M',' ','L','i','n','k','s','\0'}; -static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; +/* !! MISSING Win2k3-compatible paths from the list below; absent from Wine !! */ #ifndef __REACTOS__ -static const WCHAR PicturesW[] = {'P','i','c','t','u','r','e','s','\0'}; -static const WCHAR Pictures_Sample_PicturesW[] = {'P','i','c','t','u','r','e','s','\\','S','a','m','p','l','e',' ','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR Pictures_Slide_ShowsW[] = {'P','i','c','t','u','r','e','s','\\','S','l','i','d','e',' ','S','h','o','w','s','\0'}; -#endif -static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'}; -#ifndef __REACTOS__ -static const WCHAR Program_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\0'}; -static const WCHAR Program_Files_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\0'}; -#endif -static const WCHAR Program_Files_x86W[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\0'}; -static const WCHAR Program_Files_x86_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\0'}; -static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'}; -static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; -static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'}; -#ifndef __REACTOS__ -static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; -#endif -static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'}; -static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'}; -#ifndef __REACTOS__ -static const WCHAR Saved_GamesW[] = {'S','a','v','e','d',' ','G','a','m','e','s','\0'}; -static const WCHAR SearchesW[] = {'S','e','a','r','c','h','e','s','\0'}; -#endif -static const WCHAR SendToW[] = {'S','e','n','d','T','o','\0'}; -static const WCHAR StartUpW[] = {'S','t','a','r','t','U','p','\0'}; -static const WCHAR Start_MenuW[] = {'S','t','a','r','t',' ','M','e','n','u','\0'}; -#ifndef __REACTOS__ -static const WCHAR Start_Menu_ProgramsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\0'}; -static const WCHAR Start_Menu_Admin_ToolsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; -static const WCHAR Start_Menu_StartupW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'}; -#endif -static const WCHAR TemplatesW[] = {'T','e','m','p','l','a','t','e','s','\0'}; +static const WCHAR Application_DataW[] = L"Application Data"; +static const WCHAR Local_Settings_Application_DataW[] = L"Local Settings\\Application Data"; +static const WCHAR Local_Settings_HistoryW[] = L"Local Settings\\History"; +static const WCHAR Local_Settings_Temporary_Internet_FilesW[] = L"Local Settings\\Temporary Internet Files"; +static const WCHAR MusicW[] = L"Music"; +static const WCHAR PicturesW[] = L"Pictures"; +static const WCHAR Program_FilesW[] = L"Program Files"; +static const WCHAR Program_Files_Common_FilesW[] = L"Program Files\\Common Files"; +static const WCHAR Start_Menu_ProgramsW[] = L"Start Menu\\Programs"; +static const WCHAR Start_Menu_Admin_ToolsW[] = L"Start Menu\\Programs\\Administrative Tools"; +static const WCHAR Start_Menu_StartupW[] = L"Start Menu\\Programs\\StartUp"; +#endif + +/* Long strings that are repeated many times: keep them here */ +static const WCHAR szSHFolders[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; +static const WCHAR szSHUserFolders[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders"; #ifndef __REACTOS__ -static const WCHAR UsersW[] = {'U','s','e','r','s','\0'}; -static const WCHAR UsersPublicW[] = {'U','s','e','r','s','\\','P','u','b','l','i','c','\0'}; -static const WCHAR VideosW[] = {'V','i','d','e','o','s','\0'}; -static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S','a','m','p','l','e',' ','V','i','d','e','o','s','\0'}; +static const WCHAR szKnownFolderDescriptions[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FolderDescriptions"; +static const WCHAR szKnownFolderRedirections[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders"; #endif -static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; -#ifndef __REACTOS__ -static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; -#endif -static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; -static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; -#ifndef __REACTOS__ -static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; -static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; -#endif -static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; -static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; -#ifndef __REACTOS__ -static const WCHAR szKnownFolderDescriptions[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; -static const WCHAR szKnownFolderRedirections[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s',0}; -#endif -static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { CSIDL_Type_User, @@ -971,7 +872,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x00 - CSIDL_DESKTOP */ &FOLDERID_Desktop, CSIDL_Type_User, - DesktopW, + L"Desktop", MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), #ifdef __REACTOS__ 0 @@ -988,7 +889,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x02 - CSIDL_PROGRAMS */ &FOLDERID_Programs, CSIDL_Type_User, - ProgramsW, + L"Programs", MAKEINTRESOURCEW(IDS_PROGRAMS), #ifdef __REACTOS__ 0 @@ -1013,34 +914,34 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x05 - CSIDL_PERSONAL */ &FOLDERID_Documents, CSIDL_Type_User, - PersonalW, + L"Personal", MAKEINTRESOURCEW(IDS_PERSONAL), -IDI_SHELL_MY_DOCUMENTS }, { /* 0x06 - CSIDL_FAVORITES */ &FOLDERID_Favorites, CSIDL_Type_User, - FavoritesW, + L"Favorites", MAKEINTRESOURCEW(IDS_FAVORITES), -IDI_SHELL_FAVORITES }, { /* 0x07 - CSIDL_STARTUP */ &FOLDERID_Startup, CSIDL_Type_User, - StartUpW, + L"StartUp", MAKEINTRESOURCEW(IDS_STARTUP) }, { /* 0x08 - CSIDL_RECENT */ &FOLDERID_Recent, CSIDL_Type_User, - RecentW, + L"Recent", MAKEINTRESOURCEW(IDS_RECENT), -IDI_SHELL_RECENT_DOCUMENTS }, { /* 0x09 - CSIDL_SENDTO */ &FOLDERID_SendTo, CSIDL_Type_User, - SendToW, + L"SendTo", MAKEINTRESOURCEW(IDS_SENDTO) }, { /* 0x0a - CSIDL_BITBUCKET - Recycle Bin */ @@ -1052,7 +953,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x0b - CSIDL_STARTMENU */ &FOLDERID_StartMenu, CSIDL_Type_User, - Start_MenuW, + L"Start Menu", MAKEINTRESOURCEW(IDS_STARTMENU), -IDI_SHELL_TSKBAR_STARTMENU }, @@ -1070,7 +971,7 @@ static const CSIDL_DATA CSIDL_Data[] = #else CSIDL_Type_User, #endif - My_MusicW, + L"My Music", MAKEINTRESOURCEW(IDS_MYMUSIC), -IDI_SHELL_MY_MUSIC }, @@ -1081,7 +982,7 @@ static const CSIDL_DATA CSIDL_Data[] = #else CSIDL_Type_User, #endif - My_VideoW, + L"My Video", MAKEINTRESOURCEW(IDS_MYVIDEO), -IDI_SHELL_MY_MOVIES }, @@ -1094,7 +995,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x10 - CSIDL_DESKTOPDIRECTORY */ &FOLDERID_Desktop, CSIDL_Type_User, - DesktopW, + L"Desktop", MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), #ifdef __REACTOS__ 0 @@ -1119,34 +1020,34 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x13 - CSIDL_NETHOOD */ &FOLDERID_NetHood, CSIDL_Type_User, - NetHoodW, + L"NetHood", MAKEINTRESOURCEW(IDS_NETHOOD), -IDI_SHELL_NETWORK }, { /* 0x14 - CSIDL_FONTS */ &FOLDERID_Fonts, CSIDL_Type_WindowsPath, - FontsW, - FontsW, + L"Fonts", + L"Fonts", -IDI_SHELL_FONTS_FOLDER }, { /* 0x15 - CSIDL_TEMPLATES */ &FOLDERID_Templates, CSIDL_Type_User, - TemplatesW, + L"Templates", MAKEINTRESOURCEW(IDS_TEMPLATES) }, { /* 0x16 - CSIDL_COMMON_STARTMENU */ &FOLDERID_CommonStartMenu, CSIDL_Type_AllUsers, - Common_Start_MenuW, + L"Common Start Menu", MAKEINTRESOURCEW(IDS_STARTMENU), -IDI_SHELL_TSKBAR_STARTMENU }, { /* 0x17 - CSIDL_COMMON_PROGRAMS */ &FOLDERID_CommonPrograms, CSIDL_Type_AllUsers, - Common_ProgramsW, + L"Common Programs", MAKEINTRESOURCEW(IDS_PROGRAMS), #ifdef __REACTOS__ 0 @@ -1157,13 +1058,13 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x18 - CSIDL_COMMON_STARTUP */ &FOLDERID_CommonStartup, CSIDL_Type_AllUsers, - Common_StartUpW, + L"Common StartUp", MAKEINTRESOURCEW(IDS_STARTUP) }, { /* 0x19 - CSIDL_COMMON_DESKTOPDIRECTORY */ &FOLDERID_PublicDesktop, CSIDL_Type_AllUsers, - Common_DesktopW, + L"Common Desktop", MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY), #ifdef __REACTOS__ 0 @@ -1174,20 +1075,20 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x1a - CSIDL_APPDATA */ &FOLDERID_RoamingAppData, CSIDL_Type_User, - AppDataW, + L"AppData", MAKEINTRESOURCEW(IDS_APPDATA) }, { /* 0x1b - CSIDL_PRINTHOOD */ &FOLDERID_PrintHood, CSIDL_Type_User, - PrintHoodW, + L"PrintHood", MAKEINTRESOURCEW(IDS_PRINTHOOD), -IDI_SHELL_PRINTERS_FOLDER }, { /* 0x1c - CSIDL_LOCAL_APPDATA */ &FOLDERID_LocalAppData, CSIDL_Type_User, - Local_AppDataW, + L"Local AppData", MAKEINTRESOURCEW(IDS_LOCAL_APPDATA) }, { /* 0x1d - CSIDL_ALTSTARTUP */ @@ -1205,32 +1106,32 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x1f - CSIDL_COMMON_FAVORITES */ &FOLDERID_Favorites, CSIDL_Type_AllUsers, - Common_FavoritesW, + L"Common Favorites", MAKEINTRESOURCEW(IDS_FAVORITES), -IDI_SHELL_FAVORITES }, { /* 0x20 - CSIDL_INTERNET_CACHE */ &FOLDERID_InternetCache, CSIDL_Type_User, - CacheW, + L"Cache", MAKEINTRESOURCEW(IDS_INTERNET_CACHE) }, { /* 0x21 - CSIDL_COOKIES */ &FOLDERID_Cookies, CSIDL_Type_User, - CookiesW, + L"Cookies", MAKEINTRESOURCEW(IDS_COOKIES) }, { /* 0x22 - CSIDL_HISTORY */ &FOLDERID_History, CSIDL_Type_User, - HistoryW, + L"History", MAKEINTRESOURCEW(IDS_HISTORY) }, { /* 0x23 - CSIDL_COMMON_APPDATA */ &FOLDERID_ProgramData, CSIDL_Type_AllUsers, - Common_AppDataW, + L"Common AppData", MAKEINTRESOURCEW(IDS_APPDATA) }, { /* 0x24 - CSIDL_WINDOWS */ @@ -1250,7 +1151,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x26 - CSIDL_PROGRAM_FILES */ &FOLDERID_ProgramFiles, CSIDL_Type_CurrVer, - ProgramFilesDirW, + L"ProgramFilesDir", MAKEINTRESOURCEW(IDS_PROGRAM_FILES), #ifdef __REACTOS__ 0 @@ -1265,7 +1166,7 @@ static const CSIDL_DATA CSIDL_Data[] = #else CSIDL_Type_User, #endif - My_PicturesW, + L"My Pictures", MAKEINTRESOURCEW(IDS_MYPICTURES), -IDI_SHELL_MY_PICTURES }, @@ -1285,47 +1186,47 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x2a - CSIDL_PROGRAM_FILESX86 */ &FOLDERID_ProgramFilesX86, CSIDL_Type_CurrVer, - ProgramFilesDirX86W, - Program_Files_x86W, + L"ProgramFilesDir (x86)", + L"Program Files (x86)", -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */ &FOLDERID_ProgramFilesCommon, CSIDL_Type_CurrVer, - CommonFilesDirW, + L"CommonFilesDir", MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON), -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */ &FOLDERID_ProgramFilesCommonX86, CSIDL_Type_CurrVer, - CommonFilesDirX86W, - Program_Files_x86_Common_FilesW, + L"CommonFilesDir (x86)", + L"Program Files (x86)\\Common Files", -IDI_SHELL_PROGRAMS_FOLDER }, { /* 0x2d - CSIDL_COMMON_TEMPLATES */ &FOLDERID_CommonTemplates, CSIDL_Type_AllUsers, - Common_TemplatesW, + L"Common Templates", MAKEINTRESOURCEW(IDS_TEMPLATES) }, { /* 0x2e - CSIDL_COMMON_DOCUMENTS */ &FOLDERID_PublicDocuments, CSIDL_Type_AllUsers, - Common_DocumentsW, + L"Common Documents", MAKEINTRESOURCEW(IDS_PERSONAL), -IDI_SHELL_MY_DOCUMENTS }, { /* 0x2f - CSIDL_COMMON_ADMINTOOLS */ &FOLDERID_CommonAdminTools, CSIDL_Type_AllUsers, - Common_Administrative_ToolsW, + L"Common Administrative Tools", MAKEINTRESOURCEW(IDS_ADMINTOOLS) }, { /* 0x30 - CSIDL_ADMINTOOLS */ &FOLDERID_AdminTools, CSIDL_Type_User, - Administrative_ToolsW, + L"Administrative Tools", MAKEINTRESOURCEW(IDS_ADMINTOOLS) }, { /* 0x31 - CSIDL_CONNECTIONS */ @@ -1356,21 +1257,21 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x35 - CSIDL_COMMON_MUSIC */ &FOLDERID_PublicMusic, CSIDL_Type_AllUsers, - CommonMusicW, + L"CommonMusic", MAKEINTRESOURCEW(IDS_COMMON_MUSIC), -IDI_SHELL_MY_MUSIC }, { /* 0x36 - CSIDL_COMMON_PICTURES */ &FOLDERID_PublicPictures, CSIDL_Type_AllUsers, - CommonPicturesW, + L"CommonPictures", MAKEINTRESOURCEW(IDS_COMMON_PICTURES), -IDI_SHELL_MY_PICTURES }, { /* 0x37 - CSIDL_COMMON_VIDEO */ &FOLDERID_PublicVideos, CSIDL_Type_AllUsers, - CommonVideoW, + L"CommonVideo", MAKEINTRESOURCEW(IDS_COMMON_VIDEO), -IDI_SHELL_MY_MOVIES }, @@ -1378,7 +1279,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_ResourceDir, CSIDL_Type_WindowsPath, NULL, - ResourcesW + L"Resources" }, { /* 0x39 - CSIDL_RESOURCES_LOCALIZED */ &FOLDERID_LocalizedResourcesDir, @@ -1390,13 +1291,13 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_CommonOEMLinks, CSIDL_Type_AllUsers, NULL, - OEM_LinksW + L"OEM Links" }, { /* 0x3b - CSIDL_CDBURN_AREA */ &FOLDERID_CDBurning, CSIDL_Type_User, - CD_BurningW, - Local_Settings_CD_BurningW + L"CD Burning", + L"Local Settings\\Application Data\\Microsoft\\CD Burning" }, { /* 0x3c unassigned */ &GUID_NULL, @@ -1446,7 +1347,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Contacts, CSIDL_Type_User, NULL, - ContactsW + L"Contacts" }, { /* 0x44 */ &FOLDERID_DeviceMetadataStore, @@ -1458,7 +1359,7 @@ static const CSIDL_DATA CSIDL_Data[] = &GUID_NULL, CSIDL_Type_User, NULL, - DocumentsW + L"Documents" }, { /* 0x46 */ &FOLDERID_DocumentsLibrary, @@ -1474,7 +1375,7 @@ static const CSIDL_DATA CSIDL_Data[] = CSIDL_Type_User, #endif NULL, - DownloadsW + L"Downloads" }, { /* 0x48 */ &FOLDERID_Games, @@ -1510,13 +1411,13 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Links, CSIDL_Type_User, NULL, - LinksW + L"Links" }, { /* 0x4e - CSIDL_APPDATA_LOCALLOW */ &FOLDERID_LocalAppDataLow, CSIDL_Type_User, NULL, - AppData_LocalLowW + L"AppData\\LocalLow" }, { /* 0x4f */ &FOLDERID_MusicLibrary, @@ -1534,7 +1435,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_PhotoAlbums, CSIDL_Type_User, NULL, - Pictures_Slide_ShowsW + L"Pictures\\Slide Shows" }, { /* 0x52 */ &FOLDERID_PicturesLibrary, @@ -1546,7 +1447,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Playlists, CSIDL_Type_User, NULL, - Music_PlaylistsW + L"Music\\Playlists" }, { /* 0x54 */ &FOLDERID_ProgramFilesX64, @@ -1564,31 +1465,31 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_Public, CSIDL_Type_CurrVer, /* FIXME */ NULL, - UsersPublicW + L"Users\\Public" }, { /* 0x57 */ &FOLDERID_PublicDownloads, CSIDL_Type_AllUsers, NULL, - DownloadsW + L"Downloads" }, { /* 0x58 */ &FOLDERID_PublicGameTasks, CSIDL_Type_AllUsers, NULL, - Microsoft_Windows_GameExplorerW + L"Microsoft\\Windows\\GameExplorer" }, { /* 0x59 */ &FOLDERID_PublicLibraries, CSIDL_Type_AllUsers, NULL, - Microsoft_Windows_LibrariesW + L"Microsoft\\Windows\\Libraries" }, { /* 0x5a */ &FOLDERID_PublicRingtones, CSIDL_Type_AllUsers, NULL, - Microsoft_Windows_RingtonesW + L"Microsoft\\Windows\\Ringtones" }, { /* 0x5b */ &FOLDERID_QuickLaunch, @@ -1612,37 +1513,37 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_SampleMusic, CSIDL_Type_AllUsers, NULL, - Music_Sample_MusicW + L"Music\\Sample Music" }, { /* 0x5f */ &FOLDERID_SamplePictures, CSIDL_Type_AllUsers, NULL, - Pictures_Sample_PicturesW + L"Pictures\\Sample Pictures" }, { /* 0x60 */ &FOLDERID_SamplePlaylists, CSIDL_Type_AllUsers, NULL, - Music_Sample_PlaylistsW + L"Music\\Sample Playlists" }, { /* 0x61 */ &FOLDERID_SampleVideos, CSIDL_Type_AllUsers, NULL, - Videos_Sample_VideosW + L"Videos\\Sample Videos" }, { /* 0x62 - CSIDL_SAVED_GAMES */ &FOLDERID_SavedGames, CSIDL_Type_User, NULL, - Saved_GamesW + L"Saved Games" }, { /* 0x63 - CSIDL_SEARCHES */ &FOLDERID_SavedSearches, CSIDL_Type_User, NULL, - SearchesW + L"Searches" }, { /* 0x64 */ &FOLDERID_SEARCH_CSC, @@ -1701,8 +1602,8 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x6d */ &FOLDERID_UserProfiles, CSIDL_Type_CurrVer, - UsersW, - UsersW + L"Users", + L"Users" }, { /* 0x6e */ &FOLDERID_UserProgramFiles, @@ -1920,11 +1821,11 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) switch (CSIDL_Data[folder].type) { case CSIDL_Type_User: - strcpyW(pszPath, UserProfileW); + strcpyW(pszPath, L"%USERPROFILE%"); break; #ifdef __REACTOS__ case CSIDL_Type_InMyDocuments: - strcpyW(pszPath, UserProfileW); + strcpyW(pszPath, L"%USERPROFILE%"); if (DoGetProductType(&ProductType) && ProductType == NtProductWinNt) { if (IS_INTRESOURCE(CSIDL_Data[CSIDL_MYDOCUMENTS].szDefaultPath)) @@ -1944,13 +1845,13 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) #endif case CSIDL_Type_AllUsers: #ifndef __REACTOS__ - strcpyW(pszPath, PublicProfileW); + strcpyW(pszPath, L"%PUBLIC%"); #else - strcpyW(pszPath, AllUsersProfileW); + strcpyW(pszPath, L"%ALLUSERSPROFILE%"); #endif break; case CSIDL_Type_CurrVer: - strcpyW(pszPath, SystemDriveW); + strcpyW(pszPath, L"%SystemDrive%"); break; default: ; /* no corresponding env. var, do nothing */ @@ -1984,7 +1885,7 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath) /* Gets the (unexpanded) value of the folder with index folder into pszPath. * The folder's type is assumed to be CSIDL_Type_CurrVer. Its default value - * can be overridden in the HKLM\\szCurrentVersion key. + * can be overridden in the HKLM\\Software\\Microsoft\\Windows\\CurrentVersion key. * If dwFlags has SHGFP_TYPE_DEFAULT set or if the value isn't overridden in * the registry, uses _SHGetDefaultValue to get the value. */ @@ -2012,7 +1913,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, { HKEY hKey; - if (RegCreateKeyW(HKEY_LOCAL_MACHINE, szCurrentVersion, &hKey)) + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion", &hKey)) hr = E_FAIL; else { @@ -2131,6 +2032,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, } else { + static const WCHAR DefaultW[] = L".Default"; LPCWSTR userPrefix = NULL; HKEY hRootKey; @@ -2231,7 +2133,7 @@ static HRESULT _SHOpenProfilesKey(PHKEY pKey) LONG lRet; DWORD disp; - lRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, NULL, 0, + lRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", 0, NULL, 0, KEY_ALL_ACCESS, NULL, pKey, &disp); return HRESULT_FROM_WIN32(lRet); } @@ -2324,9 +2226,9 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - strcpyW( def_val + 3, szDefaultProfileDirW ); + strcpyW( def_val + 3, L"Users" ); - hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); + hr = _SHGetProfilesValue(key, L"ProfilesDirectory", szProfilesPrefix, def_val ); } #else hr = S_OK; @@ -2336,36 +2238,35 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR strcpyW(szTemp, szSrc); while (SUCCEEDED(hr) && szTemp[0] == '%') { - if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) + if (!strncmpiW(szTemp, L"%ALLUSERSPROFILE%", ARRAY_SIZE(L"%ALLUSERSPROFILE%")-1)) { #ifndef __REACTOS__ WCHAR szAllUsers[MAX_PATH]; strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + hr = _SHGetProfilesValue(key, L"AllUsersProfile", szAllUsers, L"Public"); PathAppendW(szDest, szAllUsers); #else DWORD cchSize = cchDest; if (!GetAllUsersProfileDirectoryW(szDest, &cchSize)) goto fallback_expand; #endif - PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); + PathAppendW(szDest, szTemp + ARRAY_SIZE(L"%ALLUSERSPROFILE%")-1); } #ifndef __REACTOS__ - else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + else if (!strncmpiW(szTemp, L"%PUBLIC%", ARRAY_SIZE(L"%PUBLIC%")-1)) { WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; GetSystemDirectoryW(def_val, MAX_PATH); - strcpyW( def_val + 3, UsersPublicW ); + strcpyW( def_val + 3, L"Users\\Public" ); - hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + hr = _SHGetProfilesValue(key, L"Public", szAllUsers, def_val); PathAppendW(szDest, szAllUsers); - PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + PathAppendW(szDest, szTemp + ARRAY_SIZE(L"%PUBLIC%")-1); } #endif - else if (!strncmpiW(szTemp, UserProfileW, strlenW(UserProfileW))) + else if (!strncmpiW(szTemp, L"%USERPROFILE%", ARRAY_SIZE(L"%USERPROFILE%")-1)) { #ifndef __REACTOS__ WCHAR userName[MAX_PATH]; @@ -2379,9 +2280,9 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR if (!_SHGetUserProfileDirectoryW(hToken, szDest, &cchSize)) goto fallback_expand; #endif - PathAppendW(szDest, szTemp + strlenW(UserProfileW)); + PathAppendW(szDest, szTemp + ARRAY_SIZE(L"%USERPROFILE%")-1); } - else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW))) + else if (!strncmpiW(szTemp, L"%SystemDrive%", ARRAY_SIZE(L"%SystemDrive%")-1)) { #ifndef __REACTOS__ GetSystemDirectoryW(szDest, MAX_PATH); @@ -2389,7 +2290,7 @@ static HRESULT _SHExpandEnvironmentStrings(HANDLE hToken, LPCWSTR szSrc, LPWSTR if (!GetSystemDirectoryW(szDest, cchDest)) goto fallback_expand; #endif - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); + strcpyW(szDest + 3, szTemp + ARRAY_SIZE(L"%SystemDrive%")-1 + 1); } else #ifdef __REACTOS__ @@ -2648,11 +2549,11 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath)); end: +#ifdef __REACTOS__ /* create desktop.ini for custom icon */ if ((nFolder & CSIDL_FLAG_CREATE) && CSIDL_Data[folder].nShell32IconIndex) { - static const WCHAR s_szFormat[] = L"%%SystemRoot%%\\system32\\shell32.dll,%d"; WCHAR szIconLocation[MAX_PATH]; DWORD dwAttributes; @@ -2665,7 +2566,8 @@ end: PathAppendW(szBuildPath, L"desktop.ini"); /* build the icon location */ - StringCchPrintfW(szIconLocation, _countof(szIconLocation), s_szFormat, + StringCchPrintfW(szIconLocation, _countof(szIconLocation), + L"%%SystemRoot%%\\system32\\shell32.dll,%d", CSIDL_Data[folder].nShell32IconIndex); /* write desktop.ini */ @@ -2679,6 +2581,7 @@ end: dwAttributes |= FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; SetFileAttributesW(szBuildPath, dwAttributes); } +#endif TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr; @@ -2866,11 +2769,11 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) { hToken = (HANDLE)-1; hRootKey = HKEY_USERS; - strcpyW(userShellFolderPath, DefaultW); + strcpyW(userShellFolderPath, L".Default"); PathAddBackslashW(userShellFolderPath); strcatW(userShellFolderPath, szSHUserFolders); pUserShellFolderPath = userShellFolderPath; - strcpyW(shellFolderPath, DefaultW); + strcpyW(shellFolderPath, L".Default"); PathAddBackslashW(shellFolderPath); strcatW(shellFolderPath, szSHFolders); pShellFolderPath = shellFolderPath; diff --git a/dll/win32/shell32/wine/shellstring.c b/dll/win32/shell32/wine/shellstring.c index 8796f3813c3..6099325559c 100644 --- a/dll/win32/shell32/wine/shellstring.c +++ b/dll/win32/shell32/wine/shellstring.c @@ -244,8 +244,6 @@ VOID WINAPI CheckEscapesA( LocalFree(wString); } -static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0}; - /************************************************************************* * CheckEscapesW [SHELL32.@] * @@ -260,7 +258,7 @@ VOID WINAPI CheckEscapesW( TRACE("(%s %d) stub\n", debugstr_w(string), len); - if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) + if (StrPBrkW(string, L" \",;^") && size + 2 <= len) { s = &string[size - 1]; d = &string[size + 2]; diff --git a/dll/win32/shell32/wine/shlmenu.c b/dll/win32/shell32/wine/shlmenu.c index a5e8e3ee007..281c63b41fd 100644 --- a/dll/win32/shell32/wine/shlmenu.c +++ b/dll/win32/shell32/wine/shlmenu.c @@ -231,8 +231,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) if ( GetMenuItemCount (hmenu) == 0 ) { - static const WCHAR szEmpty[] = { '(','e','m','p','t','y',')',0 }; - FileMenu_AppendItemW (hmenu, szEmpty, uID, FM_BLANK_ICON, 0, FM_DEFAULT_HEIGHT); + FileMenu_AppendItemW (hmenu, L"(empty)", uID, FM_BLANK_ICON, 0, FM_DEFAULT_HEIGHT); NumberOfItems++; } diff --git a/dll/win32/shell32/wine/shpolicy.c b/dll/win32/shell32/wine/shpolicy.c index 6f7a2a5b20e..84086318853 100644 --- a/dll/win32/shell32/wine/shpolicy.c +++ b/dll/win32/shell32/wine/shpolicy.c @@ -55,15 +55,6 @@ typedef struct tagPOLICYDAT DWORD cache; /* cached value or 0xffffffff for invalid */ } POLICYDATA, *LPPOLICYDATA; -/* registry strings */ -static const CHAR strRegistryPolicyA[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Policies"; -static const WCHAR strRegistryPolicyW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o', - 's','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n', - '\\','P','o','l','i','c','i','e','s',0}; -static const CHAR strPolicyA[] = "Policy"; -static const WCHAR strPolicyW[] = {'P','o','l','i','c','y',0}; - /* application strings */ static const char strExplorer[] = {"Explorer"}; @@ -866,8 +857,7 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) return p->cache; } - lstrcpyA(regstr, strRegistryPolicyA); - lstrcatA(regstr, "\\"); + lstrcpyA(regstr, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\"); lstrcatA(regstr, p->appstr); /* return 0 and don't set the cache if any registry errors occur */ @@ -922,15 +912,15 @@ BOOL WINAPI SHSettingsChanged(LPCVOID unused, LPCVOID inpRegKey) { if (SHELL_OsIsUnicode()) { - if (lstrcmpiW(inpRegKey, strRegistryPolicyW) && - lstrcmpiW(inpRegKey, strPolicyW)) + if (lstrcmpiW(inpRegKey, L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies") && + lstrcmpiW(inpRegKey, L"Policy")) /* doesn't match, fail */ return FALSE; } else { - if (lstrcmpiA(inpRegKey, strRegistryPolicyA) && - lstrcmpiA(inpRegKey, strPolicyA)) + if (lstrcmpiA(inpRegKey, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies") && + lstrcmpiA(inpRegKey, "Policy")) /* doesn't match, fail */ return FALSE; }

1 0

[reactos] 01/01: [SHELL32] recyclebin.h: Correctly balance the INTERFACE defines/undefs.
by Hermès Bélusca-Maïto 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59b3545603626f45626dc… commit 59b3545603626f45626dcd538392750e472dcb43 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 9 19:00:46 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 9 19:02:41 2022 +0100 [SHELL32] recyclebin.h: Correctly balance the INTERFACE defines/undefs. --- dll/win32/shell32/shellrecyclebin/recyclebin.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin.h b/dll/win32/shell32/shellrecyclebin/recyclebin.h index 63e149e265c..2fa2d00139b 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin.h @@ -179,9 +179,7 @@ RestoreFile( /* COM interface */ -#undef INTERFACE #define INTERFACE IRecycleBinFile - DECLARE_INTERFACE_(IRecycleBinFile, IUnknown) { BEGIN_INTERFACE @@ -203,10 +201,9 @@ DECLARE_INTERFACE_(IRecycleBinFile, IUnknown) END_INTERFACE }; - #undef INTERFACE -#define INTERFACE IRecycleBinEnumList +#define INTERFACE IRecycleBinEnumList DECLARE_INTERFACE_(IRecycleBinEnumList, IUnknown) { BEGIN_INTERFACE @@ -223,10 +220,9 @@ DECLARE_INTERFACE_(IRecycleBinEnumList, IUnknown) END_INTERFACE }; - #undef INTERFACE -#define INTERFACE IRecycleBin +#define INTERFACE IRecycleBin DECLARE_INTERFACE_(IRecycleBin, IUnknown) { BEGIN_INTERFACE @@ -243,6 +239,7 @@ DECLARE_INTERFACE_(IRecycleBin, IUnknown) END_INTERFACE }; +#undef INTERFACE EXTERN_C const IID IID_IRecycleBinFile; EXTERN_C const IID IID_IRecycleBinEnumList;

1 0

[reactos] 01/01: [SYSDM] Fix the "fancy" edit Environment dialog box (#4258)
by Arnav Bhatt 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8df70629b6d99654dc71a… commit 8df70629b6d99654dc71a679bed8579b17de867b Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Sun Jan 9 22:25:25 2022 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 9 17:55:25 2022 +0100 [SYSDM] Fix the "fancy" edit Environment dialog box (#4258) Fix the issue of the changes of the environment values not being set sometimes through fancy dialog box: Make sure the environment value buffer is always reallocated before taking the values. --- dll/cpl/sysdm/environment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index b648b77e775..549a41ecf85 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -155,7 +155,9 @@ GatherDataFromListView(HWND hwndListView, return 0; } - /* Copy the variable values while seperating them with a semi-colon except for the last value */ + /* First reinitialize the value buffer, then copy the variable values while + * separating them with a semi-colon, except for the last value. */ + VarData->lpRawValue[0] = _T('\0'); for (i = 0; i < NumberOfItems; i++) { if (i > 0)

1 0

[reactos] 01/01: [MSPAINT] Add ICC_BAR_CLASSES (#4261)
by Katayama Hirofumi MZ 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17f34887f3e193f957e69… commit 17f34887f3e193f957e690e983a2a2e5c173f0b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 9 23:24:30 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 9 23:24:30 2022 +0900 [MSPAINT] Add ICC_BAR_CLASSES (#4261) The Fonts toolbar uses toolbar and tooltips. Thus this flag is needed. CORE-17949 --- base/applications/mspaint/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index ab410537a69..4d285c2874d 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -173,7 +173,7 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* initialize common controls library */ INITCOMMONCONTROLSEX iccx; iccx.dwSize = sizeof(iccx); - iccx.dwICC = ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES; + iccx.dwICC = ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES | ICC_BAR_CLASSES; InitCommonControlsEx(&iccx); LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname));

1 0

[reactos] 01/01: [SYSSETUP] Improve the Process Page
by Eric Kohl 09 Jan '22

09 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f053db3e704db680cdc7… commit 3f053db3e704db680cdc7b48ff97eb64299fdd39 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 9 14:29:17 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 9 14:29:17 2022 +0100 [SYSSETUP] Improve the Process Page - The page will support multiple tasks (WIP) - The background thread uses messages to update the page --- dll/win32/syssetup/lang/bg-BG.rc | 14 +- dll/win32/syssetup/lang/cs-CZ.rc | 14 +- dll/win32/syssetup/lang/da-DK.rc | 14 +- dll/win32/syssetup/lang/de-DE.rc | 15 +- dll/win32/syssetup/lang/el-GR.rc | 14 +- dll/win32/syssetup/lang/en-GB.rc | 14 +- dll/win32/syssetup/lang/en-US.rc | 15 +- dll/win32/syssetup/lang/es-ES.rc | 14 +- dll/win32/syssetup/lang/et-EE.rc | 14 +- dll/win32/syssetup/lang/eu-ES.rc | 14 +- dll/win32/syssetup/lang/fi-FI.rc | 14 +- dll/win32/syssetup/lang/fr-FR.rc | 14 +- dll/win32/syssetup/lang/he-IL.rc | 14 +- dll/win32/syssetup/lang/hi-IN.rc | 14 +- dll/win32/syssetup/lang/hu-HU.rc | 14 +- dll/win32/syssetup/lang/id-ID.rc | 14 +- dll/win32/syssetup/lang/it-IT.rc | 14 +- dll/win32/syssetup/lang/ja-JP.rc | 14 +- dll/win32/syssetup/lang/lt-LT.rc | 14 +- dll/win32/syssetup/lang/nl-NL.rc | 14 +- dll/win32/syssetup/lang/no-NO.rc | 14 +- dll/win32/syssetup/lang/pl-PL.rc | 14 +- dll/win32/syssetup/lang/pt-BR.rc | 14 +- dll/win32/syssetup/lang/pt-PT.rc | 14 +- dll/win32/syssetup/lang/ro-RO.rc | 14 +- dll/win32/syssetup/lang/ru-RU.rc | 14 +- dll/win32/syssetup/lang/sk-SK.rc | 14 +- dll/win32/syssetup/lang/sq-AL.rc | 14 +- dll/win32/syssetup/lang/sv-SE.rc | 14 +- dll/win32/syssetup/lang/th-TH.rc | 14 +- dll/win32/syssetup/lang/tr-TR.rc | 14 +- dll/win32/syssetup/lang/uk-UA.rc | 14 +- dll/win32/syssetup/lang/zh-CN.rc | 14 +- dll/win32/syssetup/lang/zh-HK.rc | 16 +- dll/win32/syssetup/lang/zh-TW.rc | 14 +- dll/win32/syssetup/resource.h | 90 ++++---- dll/win32/syssetup/wizard.c | 428 ++++++++++++++++++++++----------------- 37 files changed, 572 insertions(+), 440 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index f02d2292ab5..bee9f41d4cd 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Вписване на съставните", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Дата и време" IDS_DATETIMESUBTITLE "Задайте правилните дата и време." - IDS_PROCESSTITLE "Вписване на съставните" - IDS_PROCESSSUBTITLE "Почакайте..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Настройка на РеактОС" IDS_UNKNOWN_ERROR "Неизвестна грешка" - IDS_REGISTERING_COMPONENTS "Вписване на съставните..." IDS_LOADLIBRARY_FAILED "Грешка при LoadLibrary: " IDS_GETPROCADDR_FAILED "Грешка при GetProcAddr: " IDS_REGSVR_FAILED "Грешка при DllRegisterServer: " diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 151e83400c9..a504c43ad35 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -119,9 +119,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registruji součásti", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -187,8 +190,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Datum a čas" IDS_DATETIMESUBTITLE "Nastavte správný čas pro Váš počítač." - IDS_PROCESSTITLE "Registrace součástí" - IDS_PROCESSSUBTITLE "Prosím čekejte..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -197,7 +200,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" - IDS_REGISTERING_COMPONENTS "Registruji součásti..." IDS_LOADLIBRARY_FAILED "LoadLibrary selhalo: " IDS_GETPROCADDR_FAILED "GetProcAddr selhalo: " IDS_REGSVR_FAILED "DllRegisterServer selhalo: " diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 2eae84398b0..140e754deb9 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 5552e82e9e5..6802a7b0ac2 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -111,9 +111,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-Installation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registeren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installieren der Elemente des Startmenüs", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Speichern der Einstellungen", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT4, 65, 63, 232, 8 + + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +183,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Datum und Uhrzeit" IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit für Ihren Computer ein." - IDS_PROCESSTITLE "Komponenten werden registriert" - IDS_PROCESSSUBTITLE "Bitte warten..." + IDS_PROCESSTITLE "Abschliessen der Installation" + IDS_PROCESSSUBTITLE "Bitte waten Sie, während die letzten Installationsschritte ausgeführt werden." IDS_THEMESELECTIONTITLE "Erscheinungsbild" IDS_THEMESELECTIONSUBTITLE "Wählen Sie Ihr bevorzugtes Theme" END @@ -189,7 +193,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS-Installation" IDS_UNKNOWN_ERROR "Unbekannter Fehler" - IDS_REGISTERING_COMPONENTS "Registriere Komponenten..." IDS_LOADLIBRARY_FAILED "LoadLibrary fehlgeschlagen: " IDS_GETPROCADDR_FAILED "GetProcAddr fehlgeschlagen: " IDS_REGSVR_FAILED "DllRegisterServer fehlgeschlagen: " diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 163d0fc8958..907c2c32954 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Καταχώρηση στοιχείων στο μητρώο", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Ημερομηνία και ώρα" IDS_DATETIMESUBTITLE "Ορίστε τη σωστή ημερομηνία και ώρα για τον υπολογιστή σας." - IDS_PROCESSTITLE "Τίτλος" - IDS_PROCESSSUBTITLE "Υπότιτλος" + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Εγκατάσταση του ReactOS" IDS_UNKNOWN_ERROR "Άγνωστο σφάλμα" - IDS_REGISTERING_COMPONENTS "Καταχώρηση στοιχείων στο μητρώο..." IDS_LOADLIBRARY_FAILED "Το LoadLibrary απέτυχε: " IDS_GETPROCADDR_FAILED "Το GetProcAddr απέτυχε: " IDS_REGSVR_FAILED "Το DllRegisterServer απέτυχε: " diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index 52dc9989491..f26c7ece156 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." @@ -190,7 +193,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index c99ee4208a6..798607fd7bf 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,18 +201,16 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." - END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index aec821b46c5..04aa522a9ee 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -120,9 +120,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registrando componentes", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -188,8 +191,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Fecha y hora" IDS_DATETIMESUBTITLE "Fije la fecha y hora correcta de su equipo." - IDS_PROCESSTITLE "Registrando componentes" - IDS_PROCESSSUBTITLE "Espere un momento..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Apariencia" IDS_THEMESELECTIONSUBTITLE "Seleccione el estilo de su preferencia." END @@ -198,7 +201,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Instalación de ReactOS" IDS_UNKNOWN_ERROR "Error desconocido" - IDS_REGISTERING_COMPONENTS "Registrando componentes..." IDS_LOADLIBRARY_FAILED "No se pudo cargar la librería: " IDS_GETPROCADDR_FAILED "No se pudo obtener la ubicación del proceso: " IDS_REGSVR_FAILED "No se pudo registrar la librería: " diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index f4dbf052aa5..989a6c35dfe 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS'i paigaldus" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Komponentide registreerimine", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Kuupäev ja kellaaeg" IDS_DATETIMESUBTITLE "Sisesta õige kellaaeg ja kuupäev." - IDS_PROCESSTITLE "Komponentide registreerimine" - IDS_PROCESSSUBTITLE "Palun oota..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Välimus" IDS_THEMESELECTIONSUBTITLE "Vali endale eelistatav teema." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS'i paigaldus" IDS_UNKNOWN_ERROR "Tundmatu viga" - IDS_REGISTERING_COMPONENTS "Komponentide registreerimine..." IDS_LOADLIBRARY_FAILED "LoadLibrary ebaõnnestus: " IDS_GETPROCADDR_FAILED "GetProcAddr ebaõnnestus: " IDS_REGSVR_FAILED "DllRegisterServer ebaõnnestus: " diff --git a/dll/win32/syssetup/lang/eu-ES.rc b/dll/win32/syssetup/lang/eu-ES.rc index 6210af7e6a4..4af10662b54 100644 --- a/dll/win32/syssetup/lang/eu-ES.rc +++ b/dll/win32/syssetup/lang/eu-ES.rc @@ -117,9 +117,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS-aren Instalazioa" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Osagaiak erregistratzea", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -183,8 +186,8 @@ BEGIN IDS_LOCALESUBTITLE "ReactOS pertsonaliza dezakezu eskualde eta hizkuntza desberdinetarako." IDS_DATETIMETITLE "Data eta ordua" IDS_DATETIMESUBTITLE "Ezarri zure ordenagailurako data eta ordu egokiak." - IDS_PROCESSTITLE "Osagaiak erregistratzea" - IDS_PROCESSSUBTITLE "Itxaron momentu bat..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Itxura" IDS_THEMESELECTIONSUBTITLE "Hautatu gustuko duzun itxura." END @@ -193,7 +196,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS-aren Instalazioa" IDS_UNKNOWN_ERROR "Errore ezezaguna" - IDS_REGISTERING_COMPONENTS "Osagaiak erregistratzea..." IDS_LOADLIBRARY_FAILED "Ezin izan da liburutegia kargatu: " IDS_GETPROCADDR_FAILED "Ezin izan da prozesuaren kokapena lortu: " IDS_REGSVR_FAILED "Ezin izan da liburutegia erregistratu: " diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index cdf3c2ab56c..312688b6c39 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 425c358a939..b83a731c7ea 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Enregistrement des composants", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date et Heure" IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." - IDS_PROCESSTITLE "Enregistrement des composants" - IDS_PROCESSSUBTITLE "Veuillez patienter..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Apparence" IDS_THEMESELECTIONSUBTITLE "Sélectionnez le thème que vous préférez" END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" - IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." IDS_LOADLIBRARY_FAILED "Échec de LoadLibrary : " IDS_GETPROCADDR_FAILED "Échec de GetProcAddr : " IDS_REGSVR_FAILED "Échec de DllRegisterServer : " diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 80ba2d65384..8f2458349bb 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "רושם רכיבים", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "תאריך ושעה" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "רושם מרכיבים" - IDS_PROCESSSUBTITLE "נא להמתין..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS התקנת" IDS_UNKNOWN_ERROR "שגיאה לא ידועה" - IDS_REGISTERING_COMPONENTS "רושם רכיבים..." IDS_LOADLIBRARY_FAILED "LoadLibrary נכשל: " IDS_GETPROCADDR_FAILED "GetProcAddr נכשל: " IDS_REGSVR_FAILED "DllRegisterServer נכשל: " diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 1625a5de437..0c0a763ac14 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -118,9 +118,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "कॉम्पोनेन्ट का दर्ज होना", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -186,8 +189,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "दिनांक और समय" IDS_DATETIMESUBTITLE "अपने कंप्यूटर के लिए सही तारीख और समय निर्धारित करें।" - IDS_PROCESSTITLE "कम्पोनन्ट का दर्ज" - IDS_PROCESSSUBTITLE "कृपया प्रतीक्षा करें..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "दिखावट" IDS_THEMESELECTIONSUBTITLE "अपनी पसंद का थीम चुनें।" @@ -197,7 +200,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "रिऐक्ट ओएस सेटअप" IDS_UNKNOWN_ERROR "अज्ञात त्रुटि" - IDS_REGISTERING_COMPONENTS "कॉम्पोनेन्ट का दर्ज होना..." IDS_LOADLIBRARY_FAILED "लोडलाइब्रेरी विफल रहा: " IDS_GETPROCADDR_FAILED "गैटप्रौकऐड्र विफल रहा: " IDS_REGSVR_FAILED "डीललरजिस्टरसर्वर विफल रहा: " diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 726fa58848d..6bac34c96ea 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS telepítő" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Komponensek regisztrálása", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dátum és idő" IDS_DATETIMESUBTITLE "Beállíthatja a számítógép dátumát és óráját." - IDS_PROCESSTITLE "Összetevők regisztrálása" - IDS_PROCESSSUBTITLE "Kérem várjon..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Megjelenés" IDS_THEMESELECTIONSUBTITLE "Válassza ki a kívánt témát." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS telepítő" IDS_UNKNOWN_ERROR "Hiba lépett fel, de nem tudni annak okát." - IDS_REGISTERING_COMPONENTS "Komponensek regisztrálása..." IDS_LOADLIBRARY_FAILED "LoadLibrary hiba: " IDS_GETPROCADDR_FAILED "GetProcAddr hiba: " IDS_REGSVR_FAILED "DllRegisterServer hiba: " diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 282b7f13165..9938cb5869c 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Penyetelan ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Meregister komponen", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Tanggal dan Jam" IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer anda." - IDS_PROCESSTITLE "Judul halaman proses" - IDS_PROCESSSUBTITLE "Subjudul halaman proses" + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Tampilan" IDS_THEMESELECTIONSUBTITLE "Pilih tampilan yang anda suka." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Penyetelan ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" - IDS_REGISTERING_COMPONENTS "Meregister komponen..." IDS_LOADLIBRARY_FAILED "LoadLibrary gagal: " IDS_GETPROCADDR_FAILED "GetProcAddr gagal: " IDS_REGSVR_FAILED "DllRegisterServer gagal: " diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 9a25d6f517a..3eb5fe627bb 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 20, 7, 253, 20 - LTEXT "", IDC_ITEM, 20, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 70, 253, 8 + LTEXT "Registrazione dei componenti", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data e ora" IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio computer." - IDS_PROCESSTITLE "Registrazione dei componenti" - IDS_PROCESSSUBTITLE "Attendere prego..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Aspetto" IDS_THEMESELECTIONSUBTITLE "Seleziona il tema che preferisci." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" - IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " IDS_REGSVR_FAILED "DllRegisterServer fallito: " diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 82b32a85143..f0515778dd5 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "コンポーネントを登録しています", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "日付と時刻" IDS_DATETIMESUBTITLE "コンピュータの日付と時刻を正しく設定して下さい。" - IDS_PROCESSTITLE "コンポーネントの登録中" - IDS_PROCESSSUBTITLE "お待ち下さい..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "外観" IDS_THEMESELECTIONSUBTITLE "好きなテーマをお選び下さい" END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS セットアップ" IDS_UNKNOWN_ERROR "不明なエラー" - IDS_REGISTERING_COMPONENTS "コンポーネントを登録しています..." IDS_LOADLIBRARY_FAILED "LoadLibrary に失敗: " IDS_GETPROCADDR_FAILED "GetProcAddr に失敗: " IDS_REGSVR_FAILED "DllRegisterServer に失敗: " diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 576131703c2..c9192289537 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 7d594f52b43..1cdc63dfe60 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index b8e4e2f1f09..367c562bcfa 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registrerer komponenter", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dato og tid" IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin." - IDS_PROCESSTITLE "Bearbeid side tittel" - IDS_PROCESSSUBTITLE "Bearbeider side undertittel" + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" - IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: " IDS_GETPROCADDR_FAILED "GetProcAddr feilet: " IDS_REGSVR_FAILED "DllRegisterServer feilet: " diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 828acf3e386..3ae108f9b43 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Rejestracja składników", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data i godzina" IDS_DATETIMESUBTITLE "Ustaw prawidłową datę i godzinę." - IDS_PROCESSTITLE "Rejestracja składników" - IDS_PROCESSSUBTITLE "Proszę czekać..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Wygląd" IDS_THEMESELECTIONSUBTITLE "Wybierz motyw, który preferujesz." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Instalator systemu ReactOS" IDS_UNKNOWN_ERROR "Nieznany błąd" - IDS_REGISTERING_COMPONENTS "Rejestracja składników..." IDS_LOADLIBRARY_FAILED "Funkcja LoadLibrary napotkała problem: " IDS_GETPROCADDR_FAILED "Funkcja GetProcAddr napotkała problem: " IDS_REGSVR_FAILED "Funkcja DllRegisterServer napotkała problem: " diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index a2c5c176717..6956e47f65c 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registrando componentes", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu computador." - IDS_PROCESSTITLE "Registrando componentes" - IDS_PROCESSSUBTITLE "Por favor aguarde..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Instalação do ReactOS" IDS_UNKNOWN_ERROR "Erro Desconhecido" - IDS_REGISTERING_COMPONENTS "Registrando componentes..." IDS_LOADLIBRARY_FAILED "LoadLibrary falhou: " IDS_GETPROCADDR_FAILED "GetProcAddr falhou: " IDS_REGSVR_FAILED "DllRegisterServer falhou: " diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 9776a609035..bc93c59c3a0 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -111,9 +111,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "A registar componentes", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -179,8 +182,8 @@ BEGIN IDS_LAYOUTTEXT "O método e idioma de entrada de texto padrão é: Estilo de teclado %s" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu computador." - IDS_PROCESSTITLE "A registar componentes" - IDS_PROCESSSUBTITLE "Por favor aguarde..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Aparência" IDS_THEMESELECTIONSUBTITLE "Seleccione o tema perferido." END @@ -189,7 +192,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Instalação do ReactOS" IDS_UNKNOWN_ERROR "Erro Desconhecido" - IDS_REGISTERING_COMPONENTS "A registar componentes..." IDS_LOADLIBRARY_FAILED "LoadLibrary falhou: " IDS_GETPROCADDR_FAILED "GetProcAddr falhou: " IDS_REGSVR_FAILED "DllRegisterServer falhou: " diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index a41910ee409..851348e6fc4 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -119,9 +119,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Componente în curs de înregistrare", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -187,8 +190,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dată și oră" IDS_DATETIMESUBTITLE "Stabilire dată și oră corectă pentru calculator" - IDS_PROCESSTITLE "Înregistrare componente" - IDS_PROCESSSUBTITLE "Așteptați…" + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Aspect" IDS_THEMESELECTIONSUBTITLE "Selectați tema preferată" END @@ -197,7 +200,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Asistent de instalare ReactOS" IDS_UNKNOWN_ERROR "Eroare necunoscută" - IDS_REGISTERING_COMPONENTS "Componente în curs de înregistrare…" IDS_LOADLIBRARY_FAILED "LoadLibrary a eșuat: " IDS_GETPROCADDR_FAILED "GetProcAddr a eșuat: " IDS_REGSVR_FAILED "DllRegisterServer a eșuat: " diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index c88d2a1b21f..39d0cf5ad72 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -119,9 +119,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Регистрация компонентов", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -187,8 +190,8 @@ BEGIN IDS_LAYOUTTEXT "Ваш язык и метод ввода текста по умолчанию: %s раскладка клавиатуры" IDS_DATETIMETITLE "Дата и время" IDS_DATETIMESUBTITLE "Установите правильную дату и время на вашем компьютере." - IDS_PROCESSTITLE "Процесс установки" - IDS_PROCESSSUBTITLE "Установка ReactOS на ваш компьютер." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Внешний вид" IDS_THEMESELECTIONSUBTITLE "Выберите тему, которую вы предпочитаете" END @@ -197,7 +200,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Установка ReactOS" IDS_UNKNOWN_ERROR "Неизвестная ошибка" - IDS_REGISTERING_COMPONENTS "Регистрация компонентов..." IDS_LOADLIBRARY_FAILED "Ошибка LoadLibrary: " IDS_GETPROCADDR_FAILED "Ошибка GetProcAddr: " IDS_REGSVR_FAILED "Ошибка DllRegisterServer: " diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 75dbe067973..02ba3b7f9cc 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -118,9 +118,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Inštalátor systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registrujem súčasti", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -186,8 +189,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Dátum a čas" IDS_DATETIMESUBTITLE "Nastavte správny čas pre Váš počítač." - IDS_PROCESSTITLE "Registrácia súčastí" - IDS_PROCESSSUBTITLE "Počkajte, prosím ..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -196,7 +199,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Inštalátor systému ReactOS" IDS_UNKNOWN_ERROR "Neznáma chyba" - IDS_REGISTERING_COMPONENTS "Registrujem súčasti..." IDS_LOADLIBRARY_FAILED "LoadLibrary zlyhal: " IDS_GETPROCADDR_FAILED "GetProcAddr zlyhal: " IDS_REGSVR_FAILED "DllRegisterServer zlyhal: " diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index b2f52560bdf..736b5e27ce1 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Ndërto ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Regjistrimi Komponenteve", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Data dhe Ora" IDS_DATETIMESUBTITLE "Vendos datën e saktë dhe orën për kompjuterin tuaj." - IDS_PROCESSTITLE "Regjistrimi Komponenteve" - IDS_PROCESSSUBTITLE "Ju Lutem prisni..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Ndërtuesi ReactOS" IDS_UNKNOWN_ERROR "gabim i panjohur" - IDS_REGISTERING_COMPONENTS "Regjistrimi Komponenteve..." IDS_LOADLIBRARY_FAILED "LoadLibrary dështoj: " IDS_GETPROCADDR_FAILED "GetProcAddr dështoj: " IDS_REGSVR_FAILED "DllRegisterServer dështoj: " diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 8ca9de01d65..8ec45d3a4c9 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Vänligen vänta..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Okänt fel" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 49f004e3f98..38aafa9bf3c 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -130,9 +130,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Registering components", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -198,8 +201,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -208,7 +211,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index ce03d962c38..f3bf3f07a28 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -120,9 +120,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Bileşenler kaydediliyor", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -188,8 +191,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Tarih ve Saat" IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamanı ayarlayınız." - IDS_PROCESSTITLE "Bileşenler Kaydediliyor" - IDS_PROCESSSUBTITLE "Lütfen bekleyiniz..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Görünüm" IDS_THEMESELECTIONSUBTITLE "İstediğiniz temayı seçiniz." END @@ -198,7 +201,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Kur" IDS_UNKNOWN_ERROR "Bilinmeyen hata" - IDS_REGISTERING_COMPONENTS "Bileşenler kaydediliyor..." IDS_LOADLIBRARY_FAILED "LoadLibrary başarısız oldu: " IDS_GETPROCADDR_FAILED "GetProcAddr başarısız oldu: " IDS_REGSVR_FAILED "DllRegisterServer başarısız oldu: " diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 1f7009ad7cb..1f64595a993 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -120,9 +120,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "Реєстрація компонентів", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -188,8 +191,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "Дата та час" IDS_DATETIMESUBTITLE "Встановіть правильні дату і час для Вашого комп'ютера." - IDS_PROCESSTITLE "Реєстрація компонентів" - IDS_PROCESSSUBTITLE "Зачекайте, будь ласка..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "Зовнішній вигляд" IDS_THEMESELECTIONSUBTITLE "Виберіть тему, яку ви вважаєте за краще" END @@ -198,7 +201,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "Встановлення ReactOS" IDS_UNKNOWN_ERROR "Невідома помилка" - IDS_REGISTERING_COMPONENTS "Реєстрація компонентів..." IDS_LOADLIBRARY_FAILED "Помилка LoadLibrary: " IDS_GETPROCADDR_FAILED "Помилка GetProcAddr: " IDS_REGSVR_FAILED "Помилка DllRegisterServer: " diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 74ed4e693ed..b7eb5483e8d 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -118,9 +118,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "请稍候，安装程序正在注册组件。", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -186,8 +189,8 @@ BEGIN IDS_LAYOUTTEXT "您的默认文本输入语言和方法是：%s 键盘布局" IDS_DATETIMETITLE "日期和时间" IDS_DATETIMESUBTITLE "为您的计算机配置正确的日期和时间。" - IDS_PROCESSTITLE "注册组件" - IDS_PROCESSSUBTITLE "正在完成 ReactOS 最后的安装阶段" + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "外观" IDS_THEMESELECTIONSUBTITLE "选择您的主题：" END @@ -196,7 +199,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS 安装程序" IDS_UNKNOWN_ERROR "未知错误" - IDS_REGISTERING_COMPONENTS "请稍候，安装程序正在注册组件。" IDS_LOADLIBRARY_FAILED "LoadLibrary 失败: " IDS_GETPROCADDR_FAILED "GetProcAddr 失败: " IDS_REGSVR_FAILED "DllRegisterServer 失败: " diff --git a/dll/win32/syssetup/lang/zh-HK.rc b/dll/win32/syssetup/lang/zh-HK.rc index 0d331b225f1..ff814fe5d13 100644 --- a/dll/win32/syssetup/lang/zh-HK.rc +++ b/dll/win32/syssetup/lang/zh-HK.rc @@ -118,9 +118,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "正在登錄元件", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -182,12 +185,12 @@ BEGIN IDS_COMPUTERSUBTITLE "您必須提供電腦名稱和管理員密碼。" IDS_LOCALETITLE "地區設定" IDS_LOCALESUBTITLE "您可以為不同的地區和語言自訂 ReactOS。" - IDS_LOCALETEXT "目前的標準和格式設定是 %s，而目前的地區設定是 %s。" + IDS_LOCALETEXT "目前的標準和格式設定是 %s，而目前的地區設定是 %s。" IDS_LAYOUTTEXT "您的預設文字輸入語言和方法是：%s 鍵盤配置。" IDS_DATETIMETITLE "日期和時間" IDS_DATETIMESUBTITLE "為您的電腦設定正確的日期及時間。" - IDS_PROCESSTITLE "正在登錄元件" - IDS_PROCESSSUBTITLE "請稍候..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "外觀" IDS_THEMESELECTIONSUBTITLE "選擇您的主題。" @@ -197,7 +200,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS 安裝程式" IDS_UNKNOWN_ERROR "不明的錯誤" - IDS_REGISTERING_COMPONENTS "正在登錄元件..." IDS_LOADLIBRARY_FAILED "LoadLibrary 失敗： " IDS_GETPROCADDR_FAILED "GetProcAddr 失敗： " IDS_REGSVR_FAILED "DllRegisterServer 失敗： " diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 707a831294c..d749ea8ea63 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -120,9 +120,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安裝程式" FONT 9, "新細明體" BEGIN - LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 - LTEXT "", IDC_ITEM, 53, 29, 253, 20 - CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 + LTEXT "正在登錄元件", IDC_TASKTEXT1, 65, 27, 232, 8 + LTEXT "Installing start menu items", IDC_TASKTEXT2, 65, 39, 232, 8 + LTEXT "Saving settings", IDC_TASKTEXT3, 65, 51, 232, 8 + LTEXT "Removing temporary files", IDC_TASKTEXT4, 65, 63, 232, 8 + LTEXT "", IDC_ITEM, 21, 85, 275, 8 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 @@ -188,8 +191,8 @@ BEGIN IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" IDS_DATETIMETITLE "日期和時間" IDS_DATETIMESUBTITLE "為您的電腦配置正確的日期和時間。" - IDS_PROCESSTITLE "正在登錄元件" - IDS_PROCESSSUBTITLE "請稍候..." + IDS_PROCESSTITLE "Finishing the Installation" + IDS_PROCESSSUBTITLE "Please wait while Setup completes the final steps." IDS_THEMESELECTIONTITLE "外觀" IDS_THEMESELECTIONSUBTITLE "選擇您的主題。" @@ -199,7 +202,6 @@ STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS 安裝程式" IDS_UNKNOWN_ERROR "未知的錯誤" - IDS_REGISTERING_COMPONENTS "正在登錄元件..." IDS_LOADLIBRARY_FAILED "LoadLibrary 失敗︰" IDS_GETPROCADDR_FAILED "GetProcAddr 失敗︰" IDS_REGSVR_FAILED "DllRegisterServer 失敗︰" diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 173f3f05ad5..80335a544fe 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -35,45 +35,52 @@ #define IDC_STATIC -1 -#define IDD_WELCOMEPAGE 1000 -#define IDC_WELCOMETITLE 1001 +#define IDD_WELCOMEPAGE 1000 +#define IDC_WELCOMETITLE 1001 -#define IDD_ACKPAGE 1010 -#define IDC_PROJECTS 1011 -#define IDC_VIEWGPL 1012 +#define IDD_ACKPAGE 1010 +#define IDC_PROJECTS 1011 +#define IDC_VIEWGPL 1012 #define IDD_OWNERPAGE 1020 #define IDC_OWNERNAME 1021 #define IDC_OWNERORGANIZATION 1022 -#define IDD_COMPUTERPAGE 1030 -#define IDC_COMPUTERNAME 1031 -#define IDC_ADMINPASSWORD1 1032 -#define IDC_ADMINPASSWORD2 1033 - -#define IDD_LOCALEPAGE 1040 -#define IDC_LOCALETEXT 1041 -#define IDC_CUSTOMLOCALE 1042 -#define IDC_LAYOUTTEXT 1043 -#define IDC_CUSTOMLAYOUT 1044 - -#define IDD_DATETIMEPAGE 1050 -#define IDC_DATEPICKER 1051 -#define IDC_TIMEPICKER 1052 -#define IDC_TIMEZONELIST 1053 -#define IDC_AUTODAYLIGHT 1054 - -#define IDD_PROCESSPAGE 1060 -#define IDC_ACTIVITY 1061 -#define IDC_ITEM 1062 -#define IDC_PROCESSPROGRESS 1063 - -#define IDD_FINISHPAGE 1070 -#define IDC_FINISHTITLE 1071 -#define IDC_RESTART_PROGRESS 1072 - -#define IDD_THEMEPAGE 1080 -#define IDC_THEMEPICKER 1081 +#define IDD_COMPUTERPAGE 1030 +#define IDC_COMPUTERNAME 1031 +#define IDC_ADMINPASSWORD1 1032 +#define IDC_ADMINPASSWORD2 1033 + +#define IDD_LOCALEPAGE 1040 +#define IDC_LOCALETEXT 1041 +#define IDC_CUSTOMLOCALE 1042 +#define IDC_LAYOUTTEXT 1043 +#define IDC_CUSTOMLAYOUT 1044 + +#define IDD_DATETIMEPAGE 1050 +#define IDC_DATEPICKER 1051 +#define IDC_TIMEPICKER 1052 +#define IDC_TIMEZONELIST 1053 +#define IDC_AUTODAYLIGHT 1054 + +#define IDD_PROCESSPAGE 1060 +#define IDC_ITEM 1061 +#define IDC_PROCESSPROGRESS 1062 +#define IDC_TASKTEXT1 1063 +#define IDC_TASKTEXT2 1064 +#define IDC_TASKTEXT3 1065 +#define IDC_TASKTEXT4 1066 +#define IDC_TASKBITMAP1 1067 +#define IDC_TASKBITMAP2 1068 +#define IDC_TASKBITMAP3 1069 +#define IDC_TASKBITMAP4 1070 + +#define IDD_FINISHPAGE 1080 +#define IDC_FINISHTITLE 1081 +#define IDC_RESTART_PROGRESS 1082 + +#define IDD_THEMEPAGE 1090 +#define IDC_THEMEPICKER 1091 #define IDD_GPL 2100 #define IDC_GPL_TEXT 2101 @@ -124,15 +131,14 @@ #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 -#define IDS_REGISTERING_COMPONENTS 3302 -#define IDS_LOADLIBRARY_FAILED 3303 -#define IDS_GETPROCADDR_FAILED 3304 -#define IDS_REGSVR_FAILED 3305 -#define IDS_DLLINSTALL_FAILED 3306 -#define IDS_TIMEOUT 3307 -#define IDS_REASON_UNKNOWN 3308 -#define IDS_ADMINISTRATOR_NAME 3309 -#define IDS_MACHINE_OWNER_NAME 3310 +#define IDS_LOADLIBRARY_FAILED 3302 +#define IDS_GETPROCADDR_FAILED 3303 +#define IDS_REGSVR_FAILED 3304 +#define IDS_DLLINSTALL_FAILED 3305 +#define IDS_TIMEOUT 3306 +#define IDS_REASON_UNKNOWN 3307 +#define IDS_ADMINISTRATOR_NAME 3308 +#define IDS_MACHINE_OWNER_NAME 3309 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 77db90686f2..0dcebc6d12e 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -33,14 +33,27 @@ = 1 Registration completed lParam = Pointer to a REGISTRATIONNOTIFY structure */ +#define PM_ITEM_START (WM_APP + 2) +#define PM_ITEM_END (WM_APP + 3) +#define PM_STEP_START (WM_APP + 4) +#define PM_STEP_END (WM_APP + 5) +#define PM_ITEMS_DONE (WM_APP + 6) + typedef struct _REGISTRATIONNOTIFY { ULONG Progress; UINT ActivityID; LPCWSTR CurrentItem; LPCWSTR ErrorMessage; + UINT MessageID; + DWORD LastError; } REGISTRATIONNOTIFY, *PREGISTRATIONNOTIFY; +typedef struct _ITEMSDATA +{ + HWND hwndDlg; +} ITEMSDATA, *PITEMSDATA; + typedef struct _REGISTRATIONDATA { HWND hwndDlg; @@ -2008,16 +2021,15 @@ RegistrationNotificationProc(PVOID Context, REGISTRATIONNOTIFY RegistrationNotify; PSP_REGISTER_CONTROL_STATUSW StatusInfo; UINT MessageID; - WCHAR ErrorMessage[128]; - RegistrationData = (PREGISTRATIONDATA) Context; + RegistrationData = (PREGISTRATIONDATA)Context; - if (SPFILENOTIFY_STARTREGISTRATION == Notification || - SPFILENOTIFY_ENDREGISTRATION == Notification) + if (Notification == SPFILENOTIFY_STARTREGISTRATION || + Notification == SPFILENOTIFY_ENDREGISTRATION) { StatusInfo = (PSP_REGISTER_CONTROL_STATUSW) Param1; RegistrationNotify.CurrentItem = wcsrchr(StatusInfo->FileName, L'\\'); - if (NULL == RegistrationNotify.CurrentItem) + if (RegistrationNotify.CurrentItem == NULL) { RegistrationNotify.CurrentItem = StatusInfo->FileName; } @@ -2026,12 +2038,13 @@ RegistrationNotificationProc(PVOID Context, RegistrationNotify.CurrentItem++; } - if (SPFILENOTIFY_STARTREGISTRATION == Notification) + if (Notification == SPFILENOTIFY_STARTREGISTRATION) { DPRINT("Received SPFILENOTIFY_STARTREGISTRATION notification for %S\n", StatusInfo->FileName); RegistrationNotify.ErrorMessage = NULL; RegistrationNotify.Progress = RegistrationData->Registered; + SendMessage(RegistrationData->hwndDlg, PM_STEP_START, 0, (LPARAM)&RegistrationNotify); } else { @@ -2039,9 +2052,9 @@ RegistrationNotificationProc(PVOID Context, StatusInfo->FileName); DPRINT("Win32Error %u FailureCode %u\n", StatusInfo->Win32Error, StatusInfo->FailureCode); - if (SPREG_SUCCESS != StatusInfo->FailureCode) + if (StatusInfo->FailureCode != SPREG_SUCCESS) { - switch(StatusInfo->FailureCode) + switch (StatusInfo->FailureCode) { case SPREG_LOADLIBRARY: MessageID = IDS_LOADLIBRARY_FAILED; @@ -2062,36 +2075,24 @@ RegistrationNotificationProc(PVOID Context, MessageID = IDS_REASON_UNKNOWN; break; } - if (0 == LoadStringW(hDllInstance, MessageID, - ErrorMessage, - ARRAYSIZE(ErrorMessage))) - { - ErrorMessage[0] = L'\0'; - } - if (SPREG_TIMEOUT != StatusInfo->FailureCode) - { - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, - StatusInfo->Win32Error, 0, - ErrorMessage + wcslen(ErrorMessage), - ARRAYSIZE(ErrorMessage) - wcslen(ErrorMessage), - NULL); - } - RegistrationNotify.ErrorMessage = ErrorMessage; + + RegistrationNotify.MessageID = MessageID; + RegistrationNotify.LastError = StatusInfo->Win32Error; } else { - RegistrationNotify.ErrorMessage = NULL; + RegistrationNotify.MessageID = 0; + RegistrationNotify.LastError = ERROR_SUCCESS; } + if (RegistrationData->Registered < RegistrationData->DllCount) { RegistrationData->Registered++; } - } - RegistrationNotify.Progress = RegistrationData->Registered; - RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS; - SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY, - 0, (LPARAM) &RegistrationNotify); + RegistrationNotify.Progress = RegistrationData->Registered; + SendMessage(RegistrationData->hwndDlg, PM_STEP_END, 0, (LPARAM)&RegistrationNotify); + } return FILEOP_DOIT; } @@ -2104,33 +2105,62 @@ RegistrationNotificationProc(PVOID Context, } -static DWORD CALLBACK -RegistrationProc(LPVOID Parameter) +static +DWORD +RegisterDlls( + PITEMSDATA pItemsData) { - PREGISTRATIONDATA RegistrationData; - REGISTRATIONNOTIFY RegistrationNotify; + REGISTRATIONDATA RegistrationData; + WCHAR SectionName[512]; + INFCONTEXT Context; + LONG DllCount = 0; DWORD LastError = NO_ERROR; - WCHAR UnknownError[84]; - RegistrationData = (PREGISTRATIONDATA) Parameter; - RegistrationData->Registered = 0; - RegistrationData->DefaultContext = SetupInitDefaultQueueCallback(RegistrationData->hwndDlg); + ZeroMemory(&RegistrationData, sizeof(REGISTRATIONDATA)); + RegistrationData.hwndDlg = pItemsData->hwndDlg; + RegistrationData.Registered = 0; + + if (!SetupFindFirstLineW(hSysSetupInf, L"RegistrationPhase2", + L"RegisterDlls", &Context)) + { + DPRINT1("No RegistrationPhase2 section found\n"); + return FALSE; + } + + if (!SetupGetStringFieldW(&Context, 1, SectionName, + ARRAYSIZE(SectionName), + NULL)) + { + DPRINT1("Unable to retrieve section name\n"); + return FALSE; + } + + DllCount = SetupGetLineCountW(hSysSetupInf, SectionName); + DPRINT1("SectionName %S DllCount %ld\n", SectionName, DllCount); + if (DllCount < 0) + { + SetLastError(STATUS_NOT_FOUND); + return FALSE; + } + + RegistrationData.DllCount = (ULONG)DllCount; + RegistrationData.DefaultContext = SetupInitDefaultQueueCallback(RegistrationData.hwndDlg); + + SendMessage(pItemsData->hwndDlg, PM_ITEM_START, 0, (LPARAM)RegistrationData.DllCount); _SEH2_TRY { - if (!SetupInstallFromInfSectionW(GetParent(RegistrationData->hwndDlg), - hSysSetupInf, - L"RegistrationPhase2", - SPINST_REGISTRY | - SPINST_REGISTERCALLBACKAWARE | - SPINST_REGSVR, - 0, - NULL, - 0, - RegistrationNotificationProc, - RegistrationData, - NULL, - NULL)) + if (!SetupInstallFromInfSectionW(GetParent(RegistrationData.hwndDlg), + hSysSetupInf, + L"RegistrationPhase2", + SPINST_REGISTRY | SPINST_REGISTERCALLBACKAWARE | SPINST_REGSVR, + 0, + NULL, + 0, + RegistrationNotificationProc, + &RegistrationData, + NULL, + NULL)) { LastError = GetLastError(); } @@ -2142,119 +2172,157 @@ RegistrationProc(LPVOID Parameter) } _SEH2_END; - if (NO_ERROR == LastError) - { - RegistrationNotify.ErrorMessage = NULL; - } - else - { - DPRINT1("SetupInstallFromInfSection failed with error %u\n", - LastError); - if (0 == FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, NULL, LastError, 0, - (LPWSTR) &RegistrationNotify.ErrorMessage, 0, - NULL)) - { - if (0 == LoadStringW(hDllInstance, IDS_UNKNOWN_ERROR, - UnknownError, - ARRAYSIZE(UnknownError) - 20)) - { - wcscpy(UnknownError, L"Unknown error"); - } - wcscat(UnknownError, L" "); - _ultow(LastError, UnknownError + wcslen(UnknownError), 10); - RegistrationNotify.ErrorMessage = UnknownError; - } - } + SetupTermDefaultQueueCallback(RegistrationData.DefaultContext); + + SendMessage(pItemsData->hwndDlg, PM_ITEM_END, 0, LastError); + + return 0; +} + + +static +DWORD +CALLBACK +ItemCompletionThread( + LPVOID Parameter) +{ + PITEMSDATA pItemsData; + HWND hwndDlg; - RegistrationNotify.Progress = RegistrationData->DllCount; - RegistrationNotify.ActivityID = IDS_REGISTERING_COMPONENTS; - RegistrationNotify.CurrentItem = NULL; + pItemsData = (PITEMSDATA)Parameter; + hwndDlg = pItemsData->hwndDlg; + + RegisterDlls(pItemsData); RegisterTypeLibraries(hSysSetupInf, L"TypeLibraries"); + /* FIXME: Add completion steps here! */ + // FIXME: Move this call to a separate cleanup page! RtlCreateBootStatusDataFile(); - SendMessage(RegistrationData->hwndDlg, PM_REGISTRATION_NOTIFY, - 1, (LPARAM) &RegistrationNotify); - if (NULL != RegistrationNotify.ErrorMessage && - UnknownError != RegistrationNotify.ErrorMessage) - { - LocalFree((PVOID) RegistrationNotify.ErrorMessage); - } + /* Free the items data */ + HeapFree(GetProcessHeap(), 0, pItemsData); - SetupTermDefaultQueueCallback(RegistrationData->DefaultContext); - HeapFree(GetProcessHeap(), 0, RegistrationData); + /* Tell the wizard page that we are done */ + PostMessage(hwndDlg, PM_ITEMS_DONE, 0, 0); return 0; } -static BOOL -StartComponentRegistration(HWND hwndDlg, PULONG MaxProgress) +static +BOOL +RunItemCompletionThread( + _In_ HWND hwndDlg) { - HANDLE RegistrationThread; - LONG DllCount; - INFCONTEXT Context; - WCHAR SectionName[512]; - PREGISTRATIONDATA RegistrationData; + HANDLE hCompletionThread; + PITEMSDATA pItemsData; - DllCount = -1; - if (!SetupFindFirstLineW(hSysSetupInf, L"RegistrationPhase2", - L"RegisterDlls", &Context)) - { - DPRINT1("No RegistrationPhase2 section found\n"); + pItemsData = HeapAlloc(GetProcessHeap(), 0, sizeof(ITEMSDATA)); + if (pItemsData == NULL) return FALSE; - } - if (!SetupGetStringFieldW(&Context, 1, SectionName, - ARRAYSIZE(SectionName), - NULL)) + + pItemsData->hwndDlg = hwndDlg; + + hCompletionThread = CreateThread(NULL, + 0, + ItemCompletionThread, + pItemsData, + 0, + NULL); + if (hCompletionThread == NULL) { - DPRINT1("Unable to retrieve section name\n"); - return FALSE; + HeapFree(GetProcessHeap(), 0, pItemsData); } - DllCount = SetupGetLineCountW(hSysSetupInf, SectionName); - DPRINT("SectionName %S DllCount %ld\n", SectionName, DllCount); - if (DllCount < 0) + else { - SetLastError(STATUS_NOT_FOUND); - return FALSE; + CloseHandle(hCompletionThread); + return TRUE; } - *MaxProgress = (ULONG) DllCount; + return FALSE; +} - /* - * Create a background thread to do the actual registrations, so the - * main thread can just run its message loop. - */ - RegistrationThread = NULL; - RegistrationData = HeapAlloc(GetProcessHeap(), 0, - sizeof(REGISTRATIONDATA)); - if (RegistrationData != NULL) - { - RegistrationData->hwndDlg = hwndDlg; - RegistrationData->DllCount = DllCount; - RegistrationThread = CreateThread(NULL, 0, RegistrationProc, - RegistrationData, 0, NULL); - if (RegistrationThread != NULL) +static +VOID +ShowItemError( + HWND hwndDlg, + DWORD LastError) +{ + LPWSTR ErrorMessage = NULL; + WCHAR UnknownError[84]; + WCHAR Title[64]; + + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, LastError, 0, ErrorMessage, 0, NULL) == 0) + { + if (LoadStringW(hDllInstance, IDS_UNKNOWN_ERROR, + UnknownError, + ARRAYSIZE(UnknownError) - 20) == 0) { - CloseHandle(RegistrationThread); + wcscpy(UnknownError, L"Unknown error"); } - else + wcscat(UnknownError, L" "); + _ultow(LastError, UnknownError + wcslen(UnknownError), 10); + ErrorMessage = UnknownError; + } + + if (ErrorMessage != NULL) + { + if (LoadStringW(hDllInstance, IDS_REACTOS_SETUP, + Title, ARRAYSIZE(Title)) == 0) { - DPRINT1("CreateThread failed, error %u\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, RegistrationData); - return FALSE; + wcscpy(Title, L"ReactOS Setup"); } + + MessageBoxW(hwndDlg, ErrorMessage, Title, MB_ICONERROR | MB_OK); } - else + + if (ErrorMessage != NULL && + ErrorMessage != UnknownError) { - DPRINT1("HeapAlloc() failed, error %u\n", GetLastError()); - return FALSE; + LocalFree(ErrorMessage); } +} - return TRUE; + +static +VOID +ShowStepError( + HWND hwndDlg, + PREGISTRATIONNOTIFY RegistrationNotify) +{ + WCHAR ErrorMessage[128]; + WCHAR Title[64]; + + if (LoadStringW(hDllInstance, RegistrationNotify->MessageID, + ErrorMessage, + ARRAYSIZE(ErrorMessage)) == 0) + { + ErrorMessage[0] = L'\0'; + } + + if (RegistrationNotify->MessageID != IDS_TIMEOUT) + { + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, + RegistrationNotify->LastError, 0, + ErrorMessage + wcslen(ErrorMessage), + ARRAYSIZE(ErrorMessage) - wcslen(ErrorMessage), + NULL); + } + + if (ErrorMessage[0] != L'\0') + { + if (LoadStringW(hDllInstance, IDS_REACTOS_SETUP, + Title, ARRAYSIZE(Title)) == 0) + { + wcscpy(Title, L"ReactOS Setup"); + } + + MessageBoxW(hwndDlg, ErrorMessage, + Title, MB_ICONERROR | MB_OK); + } } @@ -2266,8 +2334,6 @@ ProcessPageDlgProc(HWND hwndDlg, { PSETUPDATA SetupData; PREGISTRATIONNOTIFY RegistrationNotify; - static UINT oldActivityID = -1; - WCHAR Title[64]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); @@ -2275,30 +2341,21 @@ ProcessPageDlgProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: - { /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)SetupData); - } - break; + ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT2), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT3), SW_HIDE); + ShowWindow(GetDlgItem(hwndDlg, IDC_TASKTEXT4), SW_HIDE); + break; case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - ULONG MaxProgress = 0; - - switch (lpnm->code) + switch (((LPNMHDR)lParam)->code) { case PSN_SETACTIVE: /* Disable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), 0); - - StartComponentRegistration(hwndDlg, &MaxProgress); - - SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, - 0, MAKELPARAM(0, MaxProgress)); - SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, - 0, 0); + RunItemCompletionThread(hwndDlg); break; case PSN_WIZNEXT: @@ -2311,50 +2368,49 @@ ProcessPageDlgProc(HWND hwndDlg, default: break; } - } - break; + break; - case PM_REGISTRATION_NOTIFY: - { - WCHAR Activity[64]; - RegistrationNotify = (PREGISTRATIONNOTIFY) lParam; - // update if necessary only - if (oldActivityID != RegistrationNotify->ActivityID) + case PM_ITEM_START: + DPRINT1("PM_ITEM_START %lu\n", (ULONG)lParam); + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, (ULONG)lParam)); + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_TASKTEXT1 + wParam, WM_SETFONT, (WPARAM)SetupData->hBoldFont, (LPARAM)TRUE); + break; + + case PM_ITEM_END: + DPRINT1("PM_ITEM_END\n"); + if (lParam == ERROR_SUCCESS) { - if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, - Activity, - ARRAYSIZE(Activity))) - { - SendDlgItemMessageW(hwndDlg, IDC_ACTIVITY, WM_SETTEXT, - 0, (LPARAM) Activity); - } - oldActivityID = RegistrationNotify->ActivityID; } - SendDlgItemMessageW(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, - (LPARAM)(NULL == RegistrationNotify->CurrentItem ? - L"" : RegistrationNotify->CurrentItem)); - SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, - RegistrationNotify->Progress, 0); - if (NULL != RegistrationNotify->ErrorMessage) + else { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, - Title, ARRAYSIZE(Title))) - { - wcscpy(Title, L"ReactOS Setup"); - } - MessageBoxW(hwndDlg, RegistrationNotify->ErrorMessage, - Title, MB_ICONERROR | MB_OK); - + ShowItemError(hwndDlg, (DWORD)lParam); } + break; + + case PM_STEP_START: + DPRINT1("PM_STEP_START\n"); + RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; + SendDlgItemMessage(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, + (LPARAM)((RegistrationNotify->CurrentItem != NULL)? RegistrationNotify->CurrentItem : L"")); + break; - if (wParam) + case PM_STEP_END: + DPRINT1("PM_STEP_END\n"); + RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; + SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, RegistrationNotify->Progress, 0); + if (RegistrationNotify->LastError != ERROR_SUCCESS) { - /* Enable the Back and Next buttons */ - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT); + ShowStepError(hwndDlg, RegistrationNotify); } - } - return TRUE; + break; + + case PM_ITEMS_DONE: + DPRINT1("PM_ITEMS_DONE\n"); + /* Enable the Back and Next buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT); + break; default: break;

1 0

[reactos] 02/02: [HDAUDBUS] HDA_PdoPnp(): Remove a redundant ASSERT()
by Serge Gautherie 08 Jan '22

08 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdcefaa7cbd419aef8796… commit fdcefaa7cbd419aef8796b2f690c90d1cd968431 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jan 8 18:00:38 2022 +0300 [HDAUDBUS] HDA_PdoPnp(): Remove a redundant ASSERT() Addendum to cf7fc81 (r68311). --- drivers/wdm/audio/hdaudbus/hdaudbus.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp index 52e6cc3466b..88e82c6b7ed 100644 --- a/drivers/wdm/audio/hdaudbus/hdaudbus.cpp +++ b/drivers/wdm/audio/hdaudbus/hdaudbus.cpp @@ -131,7 +131,6 @@ HDA_PdoPnp( if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { /* handle target device relations */ - ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation); ASSERT(Irp->IoStatus.Information == 0); /* allocate device relation */

1 0

[reactos] 01/02: [KS] KsServiceBusEnumPnpRequest(): Remove a redundant ASSERT()
by Serge Gautherie 08 Jan '22

08 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba4fd57d0a11fd45af4a… commit cba4fd57d0a11fd45af4a13124daaa91132434ce Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jan 8 18:00:38 2022 +0300 [KS] KsServiceBusEnumPnpRequest(): Remove a redundant ASSERT() Addendum to c6b26fa (r50531). --- drivers/ksfilter/ks/swenum.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/ksfilter/ks/swenum.c b/drivers/ksfilter/ks/swenum.c index 79fb61ab972..1e5738f8581 100644 --- a/drivers/ksfilter/ks/swenum.c +++ b/drivers/ksfilter/ks/swenum.c @@ -2165,7 +2165,6 @@ KsServiceBusEnumPnpRequest( else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS && IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { /* handle target device relations */ - ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation); ASSERT(Irp->IoStatus.Information == 0); /* allocate device relation */

1 0

[reactos] 01/01: [VIDEOPRT] Query children only when device has been opened
by Hervé Poussineau 06 Jan '22

06 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2538583dbe13560676ac9… commit 2538583dbe13560676ac9bb3dc0911b8a070c1a1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 2 21:31:29 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 6 22:02:07 2022 +0100 [VIDEOPRT] Query children only when device has been opened HwGetVideoChildDescriptor callback must be called only after HwInitialize. CORE-17979 --- win32ss/drivers/videoprt/dispatch.c | 15 ++++++++++++++ win32ss/drivers/videoprt/videoprt.c | 41 ++++++++++++++++++++++++------------- win32ss/drivers/videoprt/videoprt.h | 5 +++++ 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index 6ab73148530..ac5e5b880d7 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -407,6 +407,9 @@ IntVideoPortDispatchOpen( { Status = STATUS_SUCCESS; InterlockedIncrement((PLONG)&DeviceExtension->DeviceOpened); + + /* Query children, now that device is opened */ + VideoPortEnumerateChildren(DeviceExtension->MiniPortDeviceExtension, NULL); } else { @@ -938,6 +941,18 @@ IntVideoPortQueryBusRelations(PDEVICE_OBJECT DeviceObject, PIRP Irp) PVIDEO_PORT_CHILD_EXTENSION ChildExtension; ULONG i; PLIST_ENTRY CurrentEntry; + NTSTATUS Status; + + if (InterlockedCompareExchange((PLONG)&DeviceExtension->DeviceOpened, 0, 0) == 0) + { + /* Device not opened. Don't enumerate children yet */ + WARN_(VIDEOPRT, "Skipping child enumeration because device is not opened"); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* Query children of the device. */ + Status = IntVideoPortEnumerateChildren(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + return Status; /* Count the children */ i = 0; diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 6f94d2a788d..4398d82e480 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -474,9 +474,6 @@ IntVideoPortFindAdapter( &HwResetAdaptersLock); } - /* Query children of the device. */ - VideoPortEnumerateChildren(&DeviceExtension->MiniPortDeviceExtension, NULL); - INFO_(VIDEOPRT, "STATUS_SUCCESS\n"); return STATUS_SUCCESS; @@ -1170,11 +1167,10 @@ VideoPortSynchronizeExecution( /* * @implemented */ -VP_STATUS -NTAPI -VideoPortEnumerateChildren( - IN PVOID HwDeviceExtension, - IN PVOID Reserved) +NTSTATUS NTAPI +IntVideoPortEnumerateChildren( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; ULONG Status; @@ -1187,17 +1183,17 @@ VideoPortEnumerateChildren( PVIDEO_PORT_CHILD_EXTENSION ChildExtension; INFO_(VIDEOPRT, "Starting child device probe\n"); - DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + DeviceExtension = DeviceObject->DeviceExtension; if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) { WARN_(VIDEOPRT, "Miniport's HwGetVideoChildDescriptor is NULL!\n"); - return NO_ERROR; + return STATUS_SUCCESS; } if (!IsListEmpty(&DeviceExtension->ChildDeviceList)) { ERR_(VIDEOPRT, "FIXME: Support calling VideoPortEnumerateChildren again!\n"); - return NO_ERROR; + return STATUS_SUCCESS; } /* Enumerate the children */ @@ -1239,7 +1235,7 @@ VideoPortEnumerateChildren( INFO_(VIDEOPRT, "Probing child: %d\n", ChildEnumInfo.ChildIndex); Status = DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor( - HwDeviceExtension, + DeviceExtension->MiniPortDeviceExtension, &ChildEnumInfo, &ChildExtension->ChildType, ChildExtension->ChildDescriptor, @@ -1331,8 +1327,25 @@ VideoPortEnumerateChildren( &ChildExtension->ListEntry); } - /* Trigger reenumeration by the PnP manager */ - IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, BusRelations); + return STATUS_SUCCESS; +} + +VP_STATUS +NTAPI +VideoPortEnumerateChildren( + IN PVOID HwDeviceExtension, + IN PVOID Reserved) +{ + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + ASSERT(DeviceExtension); + + if (DeviceExtension->PhysicalDeviceObject) + { + /* Trigger reenumeration by the PnP manager */ + IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, BusRelations); + } return NO_ERROR; } diff --git a/win32ss/drivers/videoprt/videoprt.h b/win32ss/drivers/videoprt/videoprt.h index 61363fafadc..bf4290e014d 100644 --- a/win32ss/drivers/videoprt/videoprt.h +++ b/win32ss/drivers/videoprt/videoprt.h @@ -279,6 +279,11 @@ IntVideoPortGetProcAddress( IN PVOID HwDeviceExtension, IN PUCHAR FunctionName); +NTSTATUS NTAPI +IntVideoPortEnumerateChildren( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* int10.c */ NTSTATUS

1 0

[reactos] 06/06: [VBEMP] Disable reporting multiple monitors
by Hervé Poussineau 06 Jan '22

06 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=983d9a1c2a1fcf0bb8483… commit 983d9a1c2a1fcf0bb8483384505c3babc4c72f3c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Dec 23 19:08:13 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 6 20:16:12 2022 +0100 [VBEMP] Disable reporting multiple monitors It has never worked, and only leads to some infinite loops with some hardware or BIOS configurations. --- win32ss/drivers/miniport/vbe/edid.c | 110 +++++++++++------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/win32ss/drivers/miniport/vbe/edid.c b/win32ss/drivers/miniport/vbe/edid.c index cde4fc35754..6637ee826b9 100644 --- a/win32ss/drivers/miniport/vbe/edid.c +++ b/win32ss/drivers/miniport/vbe/edid.c @@ -235,80 +235,38 @@ VBEGetVideoChildDescriptor( OUT PULONG UId, OUT PULONG pUnused) { - PVBE_DEVICE_EXTENSION VBEDeviceExtension = - (PVBE_DEVICE_EXTENSION)HwDeviceExtension; - ULONG ChildIndex; - - /* - * We are called very early in device initialization, even before - * VBEInitialize is called. So, our Int10 interface is not set. - * Ignore this call, we will trigger another one later. - */ - if (VBEDeviceExtension->Int10Interface.Size == 0) - return VIDEO_ENUM_NO_MORE_DEVICES; - - if (ChildEnumInfo->Size != sizeof(VIDEO_CHILD_ENUM_INFO)) - { - VideoPortDebugPrint(Error, "VBEMP: Wrong VIDEO_CHILD_ENUM_INFO structure size\n"); - return VIDEO_ENUM_NO_MORE_DEVICES; - } - else if (ChildEnumInfo->ChildDescriptorSize < MAX_SIZE_OF_EDID) - { - VideoPortDebugPrint(Warn, "VBEMP: Too small buffer for EDID\n"); - return VIDEO_ENUM_NO_MORE_DEVICES; - } - else if (ChildEnumInfo->ChildIndex == DISPLAY_ADAPTER_HW_ID) - { - *VideoChildType = VideoChip; - *UId = 0; - return VIDEO_ENUM_MORE_DEVICES; /* FIXME: not sure... */ - } - - /* - * Get Child ID - */ - if (ChildEnumInfo->ChildIndex != 0) - ChildIndex = ChildEnumInfo->ChildIndex; - else - ChildIndex = ChildEnumInfo->ACPIHwId; - VideoPortDebugPrint(Info, "VBEMP: ChildEnumInfo->ChildIndex %lu, ChildEnumInfo->ACPIHwId %lu => %lu\n", - ChildEnumInfo->ChildIndex, ChildEnumInfo->ACPIHwId, ChildIndex); - - /* - * Try to read EDID information using 2 different methods. - */ - if (VBEReadEdid(HwDeviceExtension, ChildIndex, pChildDescriptor)) - { - VideoPortDebugPrint(Info, "VBEMP: EDID information read directly\n"); - } - else if (VBEReadEdidUsingSCI(HwDeviceExtension, ChildIndex, pChildDescriptor)) - { - VideoPortDebugPrint(Info, "VBEMP: EDID information read using I�C\n"); - } - else if (ChildEnumInfo->ChildIndex == 1) - { - /* We must have 1 monitor, so just report it with no EDID information */ - VideoPortDebugPrint(Info, "VBEMP: Reporting monitor with no EDID information\n"); - } - else - { - VideoPortDebugPrint(Warn, "VBEMP: Unable to read EDID information\n"); - return VIDEO_ENUM_NO_MORE_DEVICES; - } - - /* - * Fill return data - */ - *VideoChildType = Monitor; - if (ChildIndex == 0) - { - /* - * This is the actual display adapter - */ - *UId = DISPLAY_ADAPTER_HW_ID; - } - else - *UId = ChildIndex; - *pUnused = 0; - return VIDEO_ENUM_MORE_DEVICES; + if (ChildEnumInfo->Size != sizeof(VIDEO_CHILD_ENUM_INFO) || + ChildEnumInfo->ChildDescriptorSize < MAX_SIZE_OF_EDID) + { + return ERROR_INVALID_FUNCTION; + } + + if (ChildEnumInfo->ChildIndex == 0) + { + /* We don't support enumeration of ACPI children */ + return ERROR_NO_MORE_DEVICES; + } + else if (ChildEnumInfo->ChildIndex == 1) + { + /* Our screen */ + *VideoChildType = Monitor; + *UId = 1; + + /* Try to read EDID information using 2 different methods. */ + if (VBEReadEdid(HwDeviceExtension, 0, pChildDescriptor)) + { + VideoPortDebugPrint(Info, "VBEMP: EDID information read directly\n"); + } + else if (VBEReadEdidUsingSCI(HwDeviceExtension, 0, pChildDescriptor)) + { + VideoPortDebugPrint(Info, "VBEMP: EDID information read using I2C\n"); + } + + return VIDEO_ENUM_MORE_DEVICES; + } + else + { + /* Unknown hardware id */ + return ERROR_NO_MORE_DEVICES; + } }

1 0

[reactos] 05/06: [VBEMP] Rename to vgapnp.sys
by Hervé Poussineau 06 Jan '22

06 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f03750de6a5418a29aa78… commit f03750de6a5418a29aa784e9c43c9862e0a5850e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Nov 24 07:55:20 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 6 20:16:12 2022 +0100 [VBEMP] Rename to vgapnp.sys - rename driver vbemp.sys to vgapnp.sys - rename service VBE to vga - store settings in non hardware-profile registry key --- boot/bootdata/hivesys.inf | 10 +++--- boot/bootdata/txtsetup.sif | 48 ++++++++++++++--------------- media/inf/display.inf | 6 ++-- win32ss/drivers/miniport/vbe/CMakeLists.txt | 12 ++++---- win32ss/drivers/miniport/vbe/vbemp.rc | 4 +-- win32ss/drivers/miniport/vbe/vbemp_reg.inf | 46 +++++++++++++-------------- 6 files changed, 62 insertions(+), 64 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index cd29e50ba69..20838a451a4 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -83,16 +83,16 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0300","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"vga" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0303","Service",0x00000000,"i8042prt" @@ -252,10 +252,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\{745A17A0-74D3-11D0-B6FE ; ReactOS specific - required to load in Safe Mode and for debugging in Safe Mode (until vga.sys and vgasave.sys are implemented) HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\Debug","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Minimal\vbemp.sys","",0x00000000,"Driver" HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\Debug","",0x00000000,"Driver Group" -HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot\Network\vbemp.sys","",0x00000000,"Driver" ; Other HKLM,"SYSTEM\CurrentControlSet\Control\Arbiters",,0x00000012 diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index a12391185cc..c74b3328aae 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -296,30 +296,30 @@ halmp.dll = 1,,,,,,,2,,,hal.dll,1,2 [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<width>,<height>,<bpp> vga = "VGA Display (640x480x4)",,VgaSave,640,480,4 -vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 -vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 -vbe_640x480x24 = "VESA Display (640x480x24)",,VBE,640,480,24 -vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32 -vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 -vbe_800x600x16 = "VESA Display (800x600x16)",,VBE,800,600,16 -vbe_800x600x24 = "VESA Display (800x600x24)",,VBE,800,600,24 -vbe = "VESA Display (800x600x32)",,VBE,800,600,32 -vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8 -vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 -vbe_1024x768x24 = "VESA Display (1024x768x24)",,VBE,1024,768,24 -vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32 -vbe_1152x864x8 = "VESA Display (1152x864x8)",,VBE,1152,864,8 -vbe_1152x864x16 = "VESA Display (1152x864x16)",,VBE,1152,864,16 -vbe_1152x864x24 = "VESA Display (1152x864x24)",,VBE,1152,864,24 -vbe_1152x864x32 = "VESA Display (1152x864x32)",,VBE,1152,864,32 -vbe_1280x1024x8 = "VESA Display (1280x1024x8)",,VBE,1280,1024,8 -vbe_1280x1024x16 = "VESA Display (1280x1024x16)",,VBE,1280,1024,16 -vbe_1280x1024x24 = "VESA Display (1280x1024x24)",,VBE,1280,1024,24 -vbe_1280x1024x32 = "VESA Display (1280x1024x32)",,VBE,1280,1024,32 -vbe_1600x1200x8 = "VESA Display (1600x1200x8)",,VBE,1600,1200,8 -vbe_1600x1200x16 = "VESA Display (1600x1200x16)",,VBE,1600,1200,16 -vbe_1600x1200x24 = "VESA Display (1600x1200x24)",,VBE,1600,1200,24 -vbe_1600x1200x32 = "VESA Display (1600x1200x32)",,VBE,1600,1200,32 +vbe_640x480x8 = "VESA Display (640x480x8)",,vga,640,480,8 +vbe_640x480x16 = "VESA Display (640x480x16)",,vga,640,480,16 +vbe_640x480x24 = "VESA Display (640x480x24)",,vga,640,480,24 +vbe_640x480x32 = "VESA Display (640x480x32)",,vga,640,480,32 +vbe_800x600x8 = "VESA Display (800x600x8)",,vga,800,600,8 +vbe_800x600x16 = "VESA Display (800x600x16)",,vga,800,600,16 +vbe_800x600x24 = "VESA Display (800x600x24)",,vga,800,600,24 +vbe = "VESA Display (800x600x32)",,vga,800,600,32 +vbe_1024x768x8 = "VESA Display (1024x768x8)",,vga,1024,768,8 +vbe_1024x768x16 = "VESA Display (1024x768x16)",,vga,1024,768,16 +vbe_1024x768x24 = "VESA Display (1024x768x24)",,vga,1024,768,24 +vbe_1024x768x32 = "VESA Display (1024x768x32)",,vga,1024,768,32 +vbe_1152x864x8 = "VESA Display (1152x864x8)",,vga,1152,864,8 +vbe_1152x864x16 = "VESA Display (1152x864x16)",,vga,1152,864,16 +vbe_1152x864x24 = "VESA Display (1152x864x24)",,vga,1152,864,24 +vbe_1152x864x32 = "VESA Display (1152x864x32)",,vga,1152,864,32 +vbe_1280x1024x8 = "VESA Display (1280x1024x8)",,vga,1280,1024,8 +vbe_1280x1024x16 = "VESA Display (1280x1024x16)",,vga,1280,1024,16 +vbe_1280x1024x24 = "VESA Display (1280x1024x24)",,vga,1280,1024,24 +vbe_1280x1024x32 = "VESA Display (1280x1024x32)",,vga,1280,1024,32 +vbe_1600x1200x8 = "VESA Display (1600x1200x8)",,vga,1600,1200,8 +vbe_1600x1200x16 = "VESA Display (1600x1200x16)",,vga,1600,1200,16 +vbe_1600x1200x24 = "VESA Display (1600x1200x24)",,vga,1600,1200,24 +vbe_1600x1200x32 = "VESA Display (1600x1200x32)",,vga,1600,1200,32 xbox = "Original Xbox NV2A Framebuffer (640x480x32)",,XboxVmp,640,480,32 [Map.Display] diff --git a/media/inf/display.inf b/media/inf/display.inf index 13e74142551..7945060869d 100644 --- a/media/inf/display.inf +++ b/media/inf/display.inf @@ -38,7 +38,7 @@ HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT [VGA.Miniport_CopyFiles.NT] -vbemp.sys +vgapnp.sys [VGA.Display_CopyFiles.NT] vgaddi.dll @@ -46,13 +46,13 @@ framebuf.dll [VGA_Inst.NT.Services] AddService = , 0x00000002 -AddService = VBE, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE +AddService = vga, 0x00000003, VBE_Service_Inst ; SPSVCINST_TAGTOFRONT + SPSVCINST_ASSOCSERVICE [VBE_Service_Inst] ServiceType = 1 StartType = 1 ErrorControl = 0 -ServiceBinary = %12%\vbemp.sys +ServiceBinary = %12%\vgapnp.sys LoadOrderGroup = Video Save ;-------------------------------- STRINGS ------------------------------- diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt index fe2b836fd48..415c9cc8d4f 100644 --- a/win32ss/drivers/miniport/vbe/CMakeLists.txt +++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt @@ -4,10 +4,10 @@ list(APPEND SOURCE vbemp.c vbemp.h) -add_library(vbemp MODULE ${SOURCE} vbemp.rc) -set_module_type(vbemp kernelmodedriver) -add_importlibs(vbemp videoprt) -add_pch(vbemp vbemp.h SOURCE) -target_link_libraries(vbemp libcntpr) -add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all) +add_library(vgapnp MODULE ${SOURCE} vbemp.rc) +set_module_type(vgapnp kernelmodedriver) +add_importlibs(vgapnp videoprt) +add_pch(vgapnp vbemp.h SOURCE) +target_link_libraries(vgapnp libcntpr) +add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) add_registry_inf(vbemp_reg.inf) diff --git a/win32ss/drivers/miniport/vbe/vbemp.rc b/win32ss/drivers/miniport/vbe/vbemp.rc index ffa67b1d25e..f057bef5767 100644 --- a/win32ss/drivers/miniport/vbe/vbemp.rc +++ b/win32ss/drivers/miniport/vbe/vbemp.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VBE Miniport Device Driver" -#define REACTOS_STR_INTERNAL_NAME "vbemp" -#define REACTOS_STR_ORIGINAL_FILENAME "vbemp.sys" +#define REACTOS_STR_INTERNAL_NAME "vgapnp" +#define REACTOS_STR_ORIGINAL_FILENAME "vgapnp.sys" #include <reactos/version.rc> diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/win32ss/drivers/miniport/vbe/vbemp_reg.inf index f3c36248311..de9acde84f7 100644 --- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf +++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf @@ -1,28 +1,28 @@ ; VBE SVGA driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Video","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vgapnp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga","Tag",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Video","Service",0x00000000,"vga" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.BitsPerPel",0x00010001,32 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.YResolution",0x00010001,600 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.FixedOutput",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.Orientation",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.RelativeX",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.RelativeY",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.ToDesktop",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Attach.PrimaryDevice",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","Device Description",0x00000000,"Generic VESA Adapter" ; This is not true but it allows to use 3rd party drivers while having the VBE driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1

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