Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70732: [CLIPBRD] - Disable message box messages added for testing purposes (but still keep them here in case one needs them). - Start implementing clipboard write file support. Work in p...
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 17:04:40 2016 New Revision: 70732 URL: http://svn.reactos.org/svn/reactos?rev=70732&view=rev Log: [CLIPBRD] - Disable message box messages added for testing purposes (but still keep them here in case one needs them). - Start implementing clipboard write file support. Work in progress. See CORE-10852 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/cliputils.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/fileutils.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -58,7 +58,7 @@ return; } - WriteClipboardFile(szFileName); + WriteClipboardFile(szFileName, CLIP_FMT_NT /* CLIP_FMT_31 */); CloseClipboard(); } Modified: trunk/reactos/base/applications/clipbrd/cliputils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -88,7 +88,7 @@ { if (!GetPredefinedClipboardFormatName(hInstance, uFormat, lpszFormat, cch)) { - if (!GetClipboardFormatName(uFormat, lpszFormat, cch)) + if (!GetClipboardFormatNameW(uFormat, lpszFormat, cch)) { LoadStringW(hInstance, STRING_CF_UNKNOWN, lpszFormat, cch); } Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -262,8 +262,9 @@ BOOL bResult; int i; - /* Open the file */ - hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + /* Open the file for read access */ + hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { ShowLastWin32Error(Globals.hMainWnd); @@ -276,7 +277,6 @@ ShowLastWin32Error(Globals.hMainWnd); goto done; } - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); /* Set data according to the clipboard file format ID */ switch (wFileIdentifier) @@ -286,7 +286,7 @@ SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); pClipFileHeader = &ClipFileHeader; pClipFormatArray = &ClipFormatArray; - MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); + // MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); break; case CLIP_FMT_NT: @@ -295,15 +295,16 @@ SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); pClipFileHeader = &NtClipFileHeader; pClipFormatArray = &NtClipFormatArray; - MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); + // MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); break; default: MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); goto done; } - + /* Completely read the header */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); if (!ReadFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesRead, NULL) || dwBytesRead != SizeOfFileHeader) { @@ -325,8 +326,8 @@ wFormatCount = ((NTCLIPFILEHEADER*)pClipFileHeader)->wFormatCount; break; } - - /* Loop through the data array */ + + /* Loop through the format data array */ for (i = 0; i < wFormatCount; i++) { if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) @@ -415,8 +416,141 @@ return; } -void WriteClipboardFile(LPCWSTR lpFileName) -{ - MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); +void WriteClipboardFile(LPCWSTR lpFileName, WORD wFileIdentifier) +{ + CLIPFILEHEADER ClipFileHeader; + CLIPFORMATHEADER ClipFormatArray; + NTCLIPFILEHEADER NtClipFileHeader; + NTCLIPFORMATHEADER NtClipFormatArray; + PVOID pClipFileHeader; + PVOID pClipFormatArray; + DWORD SizeOfFileHeader, SizeOfFormatHeader; + + WORD wFormatCount; + DWORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + // PVOID szName; + + HANDLE hFile; + DWORD dwBytesWritten; + int i; + + WCHAR szFormatName[MAX_FMT_NAME_LEN]; + + /* Create the file for write access */ + hFile = CreateFileW(lpFileName, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + wFormatCount = CountClipboardFormats(); + + /* Select the file format and setup the header according to the clipboard file format ID */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + SizeOfFileHeader = sizeof(CLIPFILEHEADER); + SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); + pClipFileHeader = &ClipFileHeader; + pClipFormatArray = &ClipFormatArray; + // MessageBox(Globals.hMainWnd, L"We write a Win3.11 clipboard file!", L"File format", 0); + + ClipFileHeader.wFileIdentifier = CLIP_FMT_31; // wFileIdentifier + ClipFileHeader.wFormatCount = wFormatCount; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + SizeOfFileHeader = sizeof(NTCLIPFILEHEADER); + SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); + pClipFileHeader = &NtClipFileHeader; + pClipFormatArray = &NtClipFormatArray; + // MessageBox(Globals.hMainWnd, L"We write a WinNT clipboard file!", L"File format", 0); + + NtClipFileHeader.wFileIdentifier = CLIP_FMT_NT; // wFileIdentifier + NtClipFileHeader.wFormatCount = wFormatCount; + break; + + default: + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + /* Write the header */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + if (!WriteFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesWritten, NULL) || + dwBytesWritten != SizeOfFileHeader) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Compute where the data should start (after the file header and the format array) */ + dwOffData = SizeOfFileHeader + wFormatCount * SizeOfFormatHeader; + + /* Loop through each format and save the data */ + i = 0; + dwFormatID = EnumClipboardFormats(0); + while (dwFormatID) + { + if (i >= wFormatCount) assert(FALSE); // break; + + RetrieveClipboardFormatName(Globals.hInstance, dwFormatID, szFormatName, ARRAYSIZE(szFormatName)); + + // TODO: Copy the format name string into the format header, + // possibly converting into ANSI for Win3.1 format, and render + // in the file the different type of data. From the renderers + // we retrieve the real size of the data into 'dwLenData'. + /* TODO: Write the data stream at 'dwOffData' */ + dwLenData = 0; + + /* Write format data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + ((CLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; + ((CLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; + ((CLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; + // szName = ((CLIPFORMATHEADER*)pClipFormatArray)->szName; + ZeroMemory( ((CLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((CLIPFORMATHEADER*)pClipFormatArray)->szName) ); + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; + ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; + // szName = ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName; + ZeroMemory( ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((NTCLIPFORMATHEADER*)pClipFormatArray)->szName) ); + break; + } + + if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!WriteFile(hFile, pClipFormatArray, SizeOfFormatHeader, &dwBytesWritten, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Adjust the offset for the next data stream */ + dwOffData += dwLenData; + + i++; + dwFormatID = EnumClipboardFormats(dwFormatID); + } + +done: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + return; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Feb 13 17:04:40 2016 @@ -49,4 +49,4 @@ } NTCLIPFORMATHEADER; void ReadClipboardFile(LPCWSTR lpFileName); -void WriteClipboardFile(LPCWSTR lpFileName); +void WriteClipboardFile(LPCWSTR lpFileName, WORD wFileIdentifier);

1 0

[ekohl] 70731: [USERINIT] - Fill the keyboard layout list. - Try to select a matching keyboard layout when the language selection gets changed.
by ekohl＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: ekohl Date: Sat Feb 13 16:12:24 2016 New Revision: 70731 URL: http://svn.reactos.org/svn/reactos?rev=70731&view=rev Log: [USERINIT] - Fill the keyboard layout list. - Try to select a matching keyboard layout when the language selection gets changed. Modified: trunk/reactos/base/system/userinit/livecd.c Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sat Feb 13 16:12:24 2016 @@ -157,6 +157,250 @@ CB_SELECTSTRING, -1, (LPARAM)langSel); +} + + +#if 0 +static +BOOL +GetLayoutID(LPWSTR szLayoutNum, LPWSTR szLCID) +{ + DWORD dwBufLen; + DWORD dwRes; + HKEY hKey; + WCHAR szTempLCID[9]; + + // Get the Layout ID + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + dwRes = RegQueryValueExW(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen); + + if (dwRes != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + } + + // Look for a substitude of this layout + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szTempLCID); + + if (RegQueryValueExW(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + { + // No substitute found, then use the old LCID + wcscpy(szLCID, szTempLCID); + } + + RegCloseKey(hKey); + } + else + { + // Substitutes key couldn't be opened, so use the old LCID + wcscpy(szLCID, szTempLCID); + } + + return TRUE; +} +#endif + + +static +BOOL +GetLayoutName( + LPCWSTR szLCID, + LPWSTR szName) +{ + HKEY hKey; + DWORD dwBufLen; + WCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; + HANDLE hLib; + unsigned i, j, k; + + wsprintf(szBuf, L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s", szLCID); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwBufLen = sizeof(szBuf); + + if (RegQueryValueExW(hKey, L"Layout Display Name", NULL, NULL, (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) + { + if (szDispName[0] == '@') + { + for (i = 0; i < wcslen(szDispName); i++) + { + if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) + { + for (j = i + 2, k = 0; j < wcslen(szDispName)+1; j++, k++) + { + szIndex[k] = szDispName[j]; + } + szDispName[i - 1] = '\0'; + break; + } + else + szDispName[i] = szDispName[i + 1]; + } + + if (ExpandEnvironmentStringsW(szDispName, szPath, MAX_PATH)) + { + hLib = LoadLibraryW(szPath); + if (hLib) + { + if (LoadStringW(hLib, _wtoi(szIndex), szPath, sizeof(szPath) / sizeof(WCHAR)) != 0) + { + wcscpy(szName, szPath); + RegCloseKey(hKey); + return TRUE; + } + FreeLibrary(hLib); + } + } + } + } + + dwBufLen = sizeof(szBuf); + + if (RegQueryValueExW(hKey, L"Layout Text", NULL, NULL, (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + } + + return FALSE; +} + + +static +VOID +SetKeyboardLayout( + HWND hwnd) +{ +#if 0 + INT iCurSel; + PWSTR pszLCID; + HKL hKl; + WCHAR szLCID[9]; + + iCurSel = SendMessageW(hwnd, CB_GETCURSEL, 0, 0); + if (iCurSel == CB_ERR) + return; + + pszLCID = (PWSTR)SendMessageW(hwnd, CB_GETITEMDATA, iCurSel, 0); + if (pszLCID == (PWSTR)CB_ERR) + return; + + if (GetLayoutID(pszLCID, szLCID)) + { + hKl = LoadKeyboardLayoutW(szLCID, KLF_ACTIVATE | KLF_SETFORPROCESS); + SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + } +#endif +} + + +static +VOID +SelectKeyboardForLanguage( + HWND hwnd, + LCID lcid) +{ + INT i, nCount; + LCID LayoutId; + + TRACE("LCID: %08lx\n", lcid); + TRACE("LangID: %04lx\n", LANGIDFROMLCID(lcid)); + + nCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0); + + for (i = 0; i < nCount; i++) + { + LayoutId = (LCID)SendMessageW(hwnd, CB_GETITEMDATA, i, 0); + TRACE("Layout: %08lx\n", LayoutId); + + if (LANGIDFROMLCID(LayoutId) == LANGIDFROMLCID(lcid)) + { + TRACE("Found 1: %08lx --> %08lx\n", LayoutId, lcid); + SendMessageW(hwnd, CB_SETCURSEL, i, 0); + return; + } + } + + for (i = 0; i < nCount; i++) + { + LayoutId = (LCID)SendMessageW(hwnd, CB_GETITEMDATA, i, 0); + TRACE("Layout: %08lx\n", LayoutId); + + if (PRIMARYLANGID(LayoutId) == PRIMARYLANGID(lcid)) + { + TRACE("Found 2: %08lx --> %08lx\n", LayoutId, lcid); + SendMessageW(hwnd, CB_SETCURSEL, i, 0); + return; + } + } + + TRACE("No match found!\n"); +} + + +static +VOID +CreateKeyboardLayoutList( + HWND hItemsList) +{ + HKEY hKey; + WCHAR szLayoutID[9], KeyName[MAX_PATH]; + DWORD dwIndex = 0; + DWORD dwSize; + INT iIndex; + LONG lError; + ULONG ulLayoutID; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Keyboard Layouts", + 0, + KEY_ENUMERATE_SUB_KEYS, + &hKey); + if (lError != ERROR_SUCCESS) + return; + + while (TRUE) + { + dwSize = sizeof(szLayoutID) / sizeof(WCHAR); + + lError = RegEnumKeyExW(hKey, + dwIndex, + szLayoutID, + &dwSize, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + break; + + GetLayoutName(szLayoutID, KeyName); + + iIndex = (INT)SendMessageW(hItemsList, CB_ADDSTRING, 0, (LPARAM)KeyName); + + ulLayoutID = wcstoul(szLayoutID, NULL, 16); + SendMessageW(hItemsList, CB_SETITEMDATA, iIndex, (LPARAM)ulLayoutID); + + // FIXME! + if (wcscmp(szLayoutID, L"00000409") == 0) + { + SendMessageW(hItemsList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); + } + + dwIndex++; + } + + RegCloseKey(hKey); } @@ -365,7 +609,9 @@ /* Center the dialog window */ CenterWindow (hwndDlg); + CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); return FALSE; @@ -377,12 +623,11 @@ return TRUE; case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) + switch (LOWORD(wParam)) { - switch (LOWORD(wParam)) - { - case IDOK: - { + case IDC_LANGUAGELIST: + if (HIWORD(wParam) == CBN_SELCHANGE) + { LCID NewLcid; INT iCurSel; @@ -391,28 +636,57 @@ CB_GETCURSEL, 0, 0); - if (iCurSel == CB_ERR) + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + TRACE("LCID: 0x%08lx\n", NewLcid); + SelectKeyboardForLanguage(GetDlgItem(hwndDlg, IDC_LAYOUTLIST), + NewLcid); + } break; - NewLcid = SendDlgItemMessageW(hwndDlg, - IDC_LANGUAGELIST, - CB_GETITEMDATA, - iCurSel, - 0); - if (NewLcid == (LCID)CB_ERR) - break; - - NtSetDefaultLocale(TRUE, NewLcid); - InitializeDefaultUserLocale(&NewLcid); - } + case IDOK: + if (HIWORD(wParam) == BN_CLICKED) + { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessageW(hwndDlg, + IDC_LANGUAGELIST, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + NtSetDefaultLocale(TRUE, NewLcid); + InitializeDefaultUserLocale(&NewLcid); + + SetKeyboardLayout(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); pState->NextPage = STARTPAGE; EndDialog(hwndDlg, 0); - break; - - default: - break; - } + } + break; + + default: + break; } break;

1 0

[hbelusca] 70730: [CLIPBRD]: Complete the read support from .clp clipboard files to be actually able to read files saved with the Windows 2k3 clipboard. There actually exist two clipboard file form...
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 16:08:09 2016 New Revision: 70730 URL: http://svn.reactos.org/svn/reactos?rev=70730&view=rev Log: [CLIPBRD]: Complete the read support from .clp clipboard files to be actually able to read files saved with the Windows 2k3 clipboard. There actually exist two clipboard file formats, so-called "Win3.1" and a "WinNT" formats. Strangely enough Win2k (and Win2k3) clipboard viewer always save the files under the "Win3.1" format, whichever one you select. I discovered the subtle difference between those two formats by looking at a very old MSDN sample program "EMFDCODE (Enhanced Metafile Decoder)" by Dennis Crain (see https://web.archive.org/web/20080406095812/http://msdn.microsoft.com/archiv… ) that still can be found on the Internet... CORE-10550 #comment Read support fixed in r70730. Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/fileutils.h trunk/reactos/base/applications/clipbrd/precomp.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -318,15 +318,15 @@ break; } + case CF_METAFILEPICT: + { + PlayMetaFileFromClipboard(hdc, &rc); + break; + } + case CF_ENHMETAFILE: { PlayEnhMetaFileFromClipboard(hdc, &rc); - break; - } - - case CF_METAFILEPICT: - { - PlayMetaFileFromClipboard(hdc, &rc); break; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,6 +4,7 @@ * FILE: base/applications/clipbrd/fileutils.c * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke + * Hermes Belusca-Maito */ #include "precomp.h" @@ -16,9 +17,7 @@ hData = GlobalAlloc(GHND, dwLength); if (!hData) - { return NULL; - } lpData = GlobalLock(hData); if (!lpData) @@ -46,20 +45,22 @@ return hData; } -static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, LPCWSTR lpFormatName) +static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, WORD FileIdentifier, PVOID lpFormatName) { HGLOBAL hData; DWORD dwTemp; hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); if (!hData) - { - return FALSE; - } + return FALSE; if ((dwFormat >= 0xC000) && (dwFormat <= 0xFFFF)) { - dwTemp = RegisterClipboardFormatW(lpFormatName); + if (FileIdentifier == CLIP_FMT_31) + dwTemp = RegisterClipboardFormatA((LPCSTR)lpFormatName); + else if ((FileIdentifier == CLIP_FMT_NT) || (FileIdentifier == CLIP_FMT_BK)) + dwTemp = RegisterClipboardFormatW((LPCWSTR)lpFormatName); + if (!dwTemp) { GlobalFree(hData); @@ -120,9 +121,9 @@ return TRUE; } -static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) -{ - HENHMETAFILE hEmf; +static BOOL ClipboardReadMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HMETAFILE hMf; HGLOBAL hData; LPVOID lpData; @@ -139,11 +140,50 @@ return FALSE; } - hEmf = SetEnhMetaFileBits(dwLength, lpData); + hMf = SetMetaFileBitsEx(dwLength, lpData); GlobalUnlock(hData); GlobalFree(hData); + if (!hMf) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_METAFILEPICT, hMf)) + { + DeleteMetaFile(hMf); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HENHMETAFILE hEmf; + HGLOBAL hData; + LPVOID lpData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return FALSE; + } + + hEmf = SetEnhMetaFileBits(dwLength, lpData); + + GlobalUnlock(hData); + GlobalFree(hData); + if (!hEmf) { SetLastError(ERROR_OUTOFMEMORY); @@ -202,13 +242,27 @@ void ReadClipboardFile(LPCWSTR lpFileName) { - CLIPBOARDFILEHEADER cfhFileHeader; - CLIPBOARDFORMATHEADER *cfhFormatArray = NULL; + CLIPFILEHEADER ClipFileHeader; + CLIPFORMATHEADER ClipFormatArray; + NTCLIPFILEHEADER NtClipFileHeader; + NTCLIPFORMATHEADER NtClipFormatArray; + PVOID pClipFileHeader; + PVOID pClipFormatArray; + DWORD SizeOfFileHeader, SizeOfFormatHeader; + + WORD wFileIdentifier; + WORD wFormatCount; + DWORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + PVOID szName; + HANDLE hFile; DWORD dwBytesRead; BOOL bResult; int i; + /* Open the file */ hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { @@ -216,39 +270,99 @@ goto done; } - if (!ReadFile(hFile, &cfhFileHeader, sizeof(cfhFileHeader), &dwBytesRead, NULL)) + /* Just read enough bytes to get the clipboard file format ID */ + if (!ReadFile(hFile, &wFileIdentifier, sizeof(wFileIdentifier), &dwBytesRead, NULL)) { ShowLastWin32Error(Globals.hMainWnd); goto done; } - - if ((cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_NT) && (cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_BK)) - { - MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); - goto done; - } - - cfhFormatArray = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER)); - if (!cfhFormatArray) - { - SetLastError(ERROR_OUTOFMEMORY); + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + + /* Set data according to the clipboard file format ID */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + SizeOfFileHeader = sizeof(CLIPFILEHEADER); + SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); + pClipFileHeader = &ClipFileHeader; + pClipFormatArray = &ClipFormatArray; + MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + SizeOfFileHeader = sizeof(NTCLIPFILEHEADER); + SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); + pClipFileHeader = &NtClipFileHeader; + pClipFormatArray = &NtClipFormatArray; + MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); + break; + + default: + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + /* Completely read the header */ + if (!ReadFile(hFile, pClipFileHeader, SizeOfFileHeader, &dwBytesRead, NULL) || + dwBytesRead != SizeOfFileHeader) + { ShowLastWin32Error(Globals.hMainWnd); goto done; } - if (!ReadFile(hFile, cfhFormatArray, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER), &dwBytesRead, NULL)) - { - ShowLastWin32Error(Globals.hMainWnd); - goto done; - } - - for (i = 0; i < cfhFileHeader.wFormatCount; i++) - { - switch (cfhFormatArray[i].dwFormatID) + /* Get header data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + assert(wFileIdentifier == ((CLIPFILEHEADER*)pClipFileHeader)->wFileIdentifier); + wFormatCount = ((CLIPFILEHEADER*)pClipFileHeader)->wFormatCount; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + assert(wFileIdentifier == ((NTCLIPFILEHEADER*)pClipFileHeader)->wFileIdentifier); + wFormatCount = ((NTCLIPFILEHEADER*)pClipFileHeader)->wFormatCount; + break; + } + + /* Loop through the data array */ + for (i = 0; i < wFormatCount; i++) + { + if (SetFilePointer(hFile, SizeOfFileHeader + i * SizeOfFormatHeader, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, pClipFormatArray, SizeOfFormatHeader, &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + /* Get format data */ + switch (wFileIdentifier) + { + case CLIP_FMT_31: + dwFormatID = ((CLIPFORMATHEADER*)pClipFormatArray)->dwFormatID; + dwLenData = ((CLIPFORMATHEADER*)pClipFormatArray)->dwLenData; + dwOffData = ((CLIPFORMATHEADER*)pClipFormatArray)->dwOffData; + szName = ((CLIPFORMATHEADER*)pClipFormatArray)->szName; + break; + + case CLIP_FMT_NT: + case CLIP_FMT_BK: + dwFormatID = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwFormatID; + dwLenData = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwLenData; + dwOffData = ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwOffData; + szName = ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName; + break; + } + + switch (dwFormatID) { case CF_OWNERDISPLAY: - case CF_DSPMETAFILEPICT: - case CF_METAFILEPICT: { break; } @@ -256,49 +370,47 @@ case CF_BITMAP: case CF_DSPBITMAP: { - bResult = ClipboardReadBitmap(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); - break; - } - + bResult = ClipboardReadBitmap(hFile, dwOffData, dwLenData); + break; + } + + case CF_METAFILEPICT: + case CF_DSPMETAFILEPICT: + { + bResult = ClipboardReadMetafile(hFile, dwOffData, dwLenData); + break; + } + + case CF_ENHMETAFILE: case CF_DSPENHMETAFILE: - case CF_ENHMETAFILE: - { - bResult = ClipboardReadEnhMetafile(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + { + bResult = ClipboardReadEnhMetafile(hFile, dwOffData, dwLenData); break; } case CF_PALETTE: { - bResult = ClipboardReadPalette(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + bResult = ClipboardReadPalette(hFile, dwOffData, dwLenData); break; } default: { - if ((cfhFormatArray[i].dwFormatID < CF_PRIVATEFIRST) || (cfhFormatArray[i].dwFormatID > CF_PRIVATELAST)) + if ((dwFormatID < CF_PRIVATEFIRST) || (dwFormatID > CF_PRIVATELAST)) { - bResult = ClipboardReadMemory(hFile, cfhFormatArray[i].dwFormatID, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData, cfhFormatArray[i].szName); + bResult = ClipboardReadMemory(hFile, dwFormatID, dwOffData, dwLenData, wFileIdentifier, szName); } break; } } if (!bResult) - { ShowLastWin32Error(Globals.hMainWnd); - } } done: if (hFile != INVALID_HANDLE_VALUE) - { CloseHandle(hFile); - } - - if (cfhFormatArray) - { - HeapFree(GetProcessHeap(), 0, cfhFormatArray); - } return; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,26 +4,49 @@ * FILE: base/applications/clipbrd/fileutils.h * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke + * Hermes Belusca-Maito */ -#define CLIPBOARD_FORMAT_31 0xC350 -#define CLIPBOARD_FORMAT_NT 0xC351 -#define CLIPBOARD_FORMAT_BK 0xC352 +#define CLIP_FMT_31 0xC350 +#define CLIP_FMT_NT 0xC351 +#define CLIP_FMT_BK 0xC352 #define MAX_FMT_NAME_LEN 79 -typedef struct _CLIPBOARDFILEHEADER +/* + * Win3.1 Clipboard File Format (default) + */ +#pragma pack(push, 1) +typedef struct _CLIPFILEHEADER { WORD wFileIdentifier; WORD wFormatCount; -} CLIPBOARDFILEHEADER; +} CLIPFILEHEADER; -typedef struct _CLIPBOARDFORMATHEADER +typedef struct _CLIPFORMATHEADER +{ + WORD dwFormatID; + DWORD dwLenData; + DWORD dwOffData; + CHAR szName[MAX_FMT_NAME_LEN]; +} CLIPFORMATHEADER; +#pragma pack(pop) + +/* + * NT Clipboard File Format + */ +typedef struct _NTCLIPFILEHEADER +{ + WORD wFileIdentifier; + WORD wFormatCount; +} NTCLIPFILEHEADER; + +typedef struct _NTCLIPFORMATHEADER { DWORD dwFormatID; DWORD dwLenData; DWORD dwOffData; WCHAR szName[MAX_FMT_NAME_LEN]; -} CLIPBOARDFORMATHEADER; +} NTCLIPFORMATHEADER; void ReadClipboardFile(LPCWSTR lpFileName); void WriteClipboardFile(LPCWSTR lpFileName); Modified: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sat Feb 13 16:08:09 2016 @@ -4,6 +4,8 @@ // #pragma once #include <limits.h> + +#include <assert.h> #include <windef.h> #include <winbase.h>

1 0

[hbelusca] 70729: [DESK.CPL]: Fix resolution slider issues. Patch by "reactosfanboy" and Mark Jansen (nick "learn_more") CORE-10792 #resolve
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 13:43:35 2016 New Revision: 70729 URL: http://svn.reactos.org/svn/reactos?rev=70729&view=rev Log: [DESK.CPL]: Fix resolution slider issues. Patch by "reactosfanboy" and Mark Jansen (nick "learn_more") CORE-10792 #resolve Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sat Feb 13 13:43:35 2016 @@ -56,6 +56,28 @@ } } +static int +CompareSettings(PSETTINGS_ENTRY Entry, DWORD dmPelsWidth, DWORD dmPelsHeight, + DWORD dmBitsPerPel, DWORD dmDisplayFrequency) +{ + if (Entry->dmPelsWidth == dmPelsWidth && + Entry->dmPelsHeight == dmPelsHeight && + Entry->dmBitsPerPel == dmBitsPerPel && + Entry->dmDisplayFrequency == dmDisplayFrequency) + { + return 0; + } + else + if ((Entry->dmPelsWidth < dmPelsWidth) || + (Entry->dmPelsWidth == dmPelsWidth && Entry->dmPelsHeight < dmPelsHeight) || + (Entry->dmPelsWidth == dmPelsWidth && Entry->dmPelsHeight == dmPelsHeight && + Entry->dmBitsPerPel < dmBitsPerPel)) + { + return 1; + } + return -1; +} + static PSETTINGS_ENTRY GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) { @@ -66,7 +88,7 @@ PSETTINGS_ENTRY Settings = NULL; HDC hDC; PSETTINGS_ENTRY Current; - DWORD bpp, xres, yres, checkbpp; + DWORD bpp, xres, yres; DWORD curDispFreq; /* Get current settings */ @@ -89,22 +111,17 @@ while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { - if ((devmode.dmBitsPerPel == 4 || - devmode.dmBitsPerPel == 8 || - devmode.dmBitsPerPel == 16 || - devmode.dmBitsPerPel == 24 || - devmode.dmBitsPerPel == 32) && - devmode.dmDisplayFrequency == curDispFreq) - { - checkbpp=1; - } - else - checkbpp=0; + iMode++; if (devmode.dmPelsWidth < 640 || - devmode.dmPelsHeight < 480 || checkbpp == 0) - { - iMode++; + devmode.dmPelsHeight < 480 || + devmode.dmDisplayFrequency != curDispFreq || + (devmode.dmBitsPerPel != 4 && + devmode.dmBitsPerPel != 8 && + devmode.dmBitsPerPel != 16 && + devmode.dmBitsPerPel != 24 && + devmode.dmBitsPerPel != 32)) + { continue; } @@ -118,12 +135,10 @@ Current->dmPelsHeight = devmode.dmPelsHeight; Current->dmBitsPerPel = devmode.dmBitsPerPel; Current->dmDisplayFrequency = devmode.dmDisplayFrequency; - while (Next != NULL && ( - Next->dmPelsWidth < Current->dmPelsWidth || - (Next->dmPelsWidth == Current->dmPelsWidth && Next->dmPelsHeight < Current->dmPelsHeight) || - (Next->dmPelsHeight == Current->dmPelsHeight && - Next->dmPelsWidth == Current->dmPelsWidth && - Next->dmBitsPerPel < Current->dmBitsPerPel ))) + while (Next != NULL && + CompareSettings(Next, devmode.dmPelsWidth, + devmode.dmPelsHeight, devmode.dmBitsPerPel, + devmode.dmDisplayFrequency) > 0) { Previous = Next; Next = Next->Flink; @@ -142,7 +157,6 @@ } NbSettings++; } - iMode++; } *pSettingsCount = NbSettings; @@ -538,6 +552,8 @@ PSETTINGS_ENTRY Current; DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; + DWORD dmBitsPerPel; + DWORD dmDisplayFrequency; /* Find if new parameters are valid */ Current = pData->CurrentDisplayDevice->CurrentSettings; @@ -549,14 +565,19 @@ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - if (dmNewPelsHeight < Current->dmPelsHeight) + dmBitsPerPel = Current->dmBitsPerPel; + dmDisplayFrequency = Current->dmDisplayFrequency; + + if (CompareSettings(Current, dmNewPelsWidth, + dmNewPelsHeight, dmBitsPerPel, + dmDisplayFrequency) < 0) { Current = Current->Blink; while (Current != NULL) { if (Current->dmPelsHeight == dmNewPelsHeight - && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == dmBitsPerPel) { pData->CurrentDisplayDevice->CurrentSettings = Current; UpdateDisplay(hwndDlg, pData, bUpdateThumb); @@ -571,8 +592,8 @@ while (Current != NULL) { if (Current->dmPelsHeight == dmNewPelsHeight - && Current->dmPelsWidth == dmNewPelsWidth - && Current->dmBitsPerPel == pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel) + && Current->dmPelsWidth == dmNewPelsWidth + && Current->dmBitsPerPel == dmBitsPerPel) { pData->CurrentDisplayDevice->CurrentSettings = Current; UpdateDisplay(hwndDlg, pData, bUpdateThumb);

1 0

[hbelusca] 70728: [MSCONFIG_NEW]: Activate OS-version-specific behaviour (ReactOS vs. Windows and pre-Vista vs. post-Vista).
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 13:11:39 2016 New Revision: 70728 URL: http://svn.reactos.org/svn/reactos?rev=70728&view=rev Log: [MSCONFIG_NEW]: Activate OS-version-specific behaviour (ReactOS vs. Windows and pre-Vista vs. post-Vista). Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/msconfig.h trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/msconfig_new/utils.c trunk/reactos/base/applications/msconfig_new/utils.h Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -29,7 +29,7 @@ /* Defaults for ReactOS */ BOOL bIsWindows = FALSE; -BOOL bIsOSVersionLessThanVista = TRUE; +BOOL bIsPreVistaOSVersion = TRUE; /* Language-independent Vendor strings */ const LPCWSTR IDS_REACTOS = L"ReactOS"; @@ -232,7 +232,7 @@ psp[nPages].pfnDlgProc = GeneralPageWndProc; ++nPages; - // if (bIsOSVersionLessThanVista) + // if (bIsPreVistaOSVersion) { /* SYSTEM.INI page */ if (MyFileExists(lpszSystemIni, NULL)) @@ -267,7 +267,7 @@ /* FreeLdr page */ // TODO: Program the interface for Vista: "light" BCD editor... - if (!bIsWindows || (bIsWindows && bIsOSVersionLessThanVista)) + if (!bIsWindows || (bIsWindows && bIsPreVistaOSVersion)) { LPCWSTR lpszLoaderIniFile = NULL; DWORD dwTabNameId = 0; @@ -346,12 +346,12 @@ INITCOMMONCONTROLSEX InitControls; /* Initialize our global version flags */ - bIsWindows = TRUE; /* IsWindowsOS(); */ // TODO: Commented for testing purposes... - bIsOSVersionLessThanVista = TRUE; /* IsOSVersionLessThanVista(); */ // TODO: Commented for testing purposes... + bIsWindows = IsWindowsOS(); + bIsPreVistaOSVersion = IsPreVistaOSVersion(); /* Initialize global strings */ szAppName = LoadResourceString(hInstance, IDS_MSCONFIG); - if (!bIsOSVersionLessThanVista) + if (!bIsPreVistaOSVersion) lpszVistaAppName = LoadResourceString(hInstance, IDS_MSCONFIG_2); /* We use a semaphore in order to have a single-instance application */ @@ -367,7 +367,7 @@ */ if ( (hSingleWnd && IsWindow(hSingleWnd)) || ( (hSingleWnd = FindWindowW(L"#32770", szAppName)) != NULL ) || - (!bIsOSVersionLessThanVista ? ( (hSingleWnd = FindWindowW(L"#32770", lpszVistaAppName)) != NULL ) : FALSE) ) + (!bIsPreVistaOSVersion ? ( (hSingleWnd = FindWindowW(L"#32770", lpszVistaAppName)) != NULL ) : FALSE) ) { /* Found it. Show the window. */ ShowWindow(hSingleWnd, SW_SHOWNORMAL); @@ -377,7 +377,7 @@ /* Quit this instance of MSConfig */ Success = FALSE; } - if (!bIsOSVersionLessThanVista) MemFree(lpszVistaAppName); + if (!bIsPreVistaOSVersion) MemFree(lpszVistaAppName); /* Quit now if we failed */ if (!Success) Modified: trunk/reactos/base/applications/msconfig_new/msconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.h [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -5,7 +5,7 @@ #endif extern BOOL bIsWindows; -extern BOOL bIsOSVersionLessThanVista; +extern BOOL bIsPreVistaOSVersion; extern const LPCWSTR IDS_REACTOS; extern const LPCWSTR IDS_MICROSOFT; Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -287,7 +287,7 @@ bAddServiceToList = params.bIsPresent; - if (bIsWindows && bIsOSVersionLessThanVista && !bAddServiceToList) + if (bIsWindows && bIsPreVistaOSVersion && !bAddServiceToList) { QUERY_REGISTRY_VALUES_TABLE ValuesQueryTable[2] = {}; ValuesQueryTable[0].QueryRoutine = GetRegistryValuedDisabledServicesQueryRoutine; @@ -935,7 +935,7 @@ KeysQueryTable[0].EntryContext = &params; RegQueryRegistryKeys(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", KeysQueryTable, (PVOID)svcName); - if (bIsWindows && bIsOSVersionLessThanVista && !params.bIsPresent) + if (bIsWindows && bIsPreVistaOSVersion && !params.bIsPresent) { QUERY_REGISTRY_VALUES_TABLE ValuesQueryTable[2] = {}; ValuesQueryTable[0].QueryRoutine = GetRegistryValuedDisabledServicesQueryRoutine; @@ -959,7 +959,7 @@ // // Delete also the valued-entry of the service. // - if (bIsWindows && bIsOSVersionLessThanVista) + if (bIsWindows && bIsPreVistaOSVersion) { HKEY hSubKey = NULL; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", 0, KEY_SET_VALUE /*KEY_READ*/, &hSubKey) == ERROR_SUCCESS) @@ -1022,7 +1022,7 @@ // // Save also a valued-entry for the service. // - if (bIsWindows && bIsOSVersionLessThanVista) + if (bIsWindows && bIsPreVistaOSVersion) { RegSetDWORDValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\services", svcName, TRUE, lpServiceConfig->dwStartType); } Modified: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -221,6 +221,67 @@ //////////////////////////////////////////////////////////////////////////////// +BOOL IsWindowsOS(VOID) +{ + BOOL bIsWindowsOS = FALSE; + + OSVERSIONINFOW osvi = {0}; + osvi.dwOSVersionInfoSize = sizeof(osvi); + + if (!GetVersionExW(&osvi)) + return FALSE; + + if (osvi.dwPlatformId != VER_PLATFORM_WIN32_NT) + return FALSE; + + /* ReactOS reports as Windows NT 5.2 */ + + if ( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion >= 2) || + (osvi.dwMajorVersion > 5) ) + { + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + LONG ret; + DWORD dwType = 0, dwBufSize = 0; + + ret = RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, NULL, &dwBufSize); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + LPTSTR lpszProductName = (LPTSTR)MemAlloc(0, dwBufSize); + RegQueryValueExW(hKey, L"ProductName", NULL, &dwType, (LPBYTE)lpszProductName, &dwBufSize); + + bIsWindowsOS = (FindSubStrI(lpszProductName, _T("Windows")) != NULL); + + MemFree(lpszProductName); + } + + RegCloseKey(hKey); + } + } + else + { + bIsWindowsOS = TRUE; + } + + return bIsWindowsOS; +} + +BOOL IsPreVistaOSVersion(VOID) +{ + OSVERSIONINFOW osvi = {0}; + osvi.dwOSVersionInfoSize = sizeof(osvi); + + if (!GetVersionExW(&osvi)) + return FALSE; + + /* Vista+-class OSes are NT >= 6 */ + return ( (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) ? (osvi.dwMajorVersion < 6) : FALSE ); +} + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename) { Modified: trunk/reactos/base/applications/msconfig_new/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] Sat Feb 13 13:11:39 2016 @@ -74,6 +74,9 @@ //////////////////////////////////////////////////////////////////////////////// +BOOL IsWindowsOS(VOID); +BOOL IsPreVistaOSVersion(VOID); + LPWSTR GetExecutableVendor(IN LPCWSTR lpszFilename);

1 0

[hbelusca] 70727: [MAGNIFY]: Improve french translation.
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 13:00:04 2016 New Revision: 70727 URL: http://svn.reactos.org/svn/reactos?rev=70727&view=rev Log: [MAGNIFY]: Improve french translation. Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 13:00:04 2016 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Quitter", IDOK, 96, 161, 50, 14 - PUSHBUTTON "Aider", IDC_BUTTON_HELP, 38, 161, 50, 14 + PUSHBUTTON "Aide", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Coefficient d'agrandissement:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Poursuite", IDC_STATIC, 7, 25, 139, 59

1 0

[hbelusca] 70726: [MSCONFIG_NEW]: Explicitely use unicode APIs.
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 12:58:41 2016 New Revision: 70726 URL: http://svn.reactos.org/svn/reactos?rev=70726&view=rev Log: [MSCONFIG_NEW]: Explicitely use unicode APIs. Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/startuppage.c Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Feb 13 12:58:41 2016 @@ -190,8 +190,8 @@ /* Set the dialog icons */ hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); - SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + SendMessageW(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); /* Sub-class the property sheet window procedure */ wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc); Modified: trunk/reactos/base/applications/msconfig_new/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/startuppage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/startuppage.c [iso-8859-1] Sat Feb 13 12:58:41 2016 @@ -32,9 +32,9 @@ hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); hStartupDialog = hDlg; - dwStyle = (DWORD) SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = (DWORD)SendMessageW(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; - SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + SendMessageW(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -131,7 +131,7 @@ { GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } } } @@ -184,7 +184,7 @@ GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); item.pszText = Data; item.iSubItem = 1; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } switch (PtrToLong(hRootKey)) @@ -202,7 +202,7 @@ _tcscat(Path, KeyName); item.pszText = Path; item.iSubItem = 2; - SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + SendMessageW(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } HeapFree(GetProcessHeap(), 0, Data); }

1 0

[pschweitzer] 70725: [EXT2] Add the ReactOS famous... hack? fix? whatever? already present in FastFAT, NTFS...: When accessing a floppy disk, our floppy storage stack can return that the disk type ...
by pschweitzer＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: pschweitzer Date: Sat Feb 13 09:16:45 2016 New Revision: 70725 URL: http://svn.reactos.org/svn/reactos?rev=70725&view=rev Log: [EXT2] Add the ReactOS famous... hack? fix? whatever? already present in FastFAT, NTFS...: When accessing a floppy disk, our floppy storage stack can return that the disk type is unknown (some would say it's legit - see comments in FastFAT) and will also return a disk sector size of 0. Then, when trying to read the floppy disk with said size, everything goes wrong (null length read is never a good thing). So, as in any other FSD in ReactOS, for disk sector size to 512 bytes in this really specific case. This fixes BSOD when having a floppy drive in ReactOS (whatever its filesystem). CORE-10464 #resolve #comment Fixed with r70725 Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] Sat Feb 13 09:16:45 2016 @@ -1496,6 +1496,13 @@ _SEH2_LEAVE; } +#ifdef __REACTOS__ + if (DiskGeometry.MediaType == Unknown) + { + DiskGeometry.BytesPerSector = 512; + } +#endif + Status = IoCreateDevice( MainDeviceObject->DriverObject, sizeof(EXT2_VCB),

1 0

[hbelusca] 70724: [DESK.CPL]: Use "WallPaperDir" for the value name of the wallpaper directory (compatible MSWin and what we do have already in the registry).
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 00:32:34 2016 New Revision: 70724 URL: http://svn.reactos.org/svn/reactos?rev=70724&view=rev Log: [DESK.CPL]: Use "WallPaperDir" for the value name of the wallpaper directory (compatible MSWin and what we do have already in the registry). Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sat Feb 13 00:32:34 2016 @@ -432,7 +432,7 @@ } /* Add all the images in the wallpaper directory. */ - if (SHRegGetPath(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion"), TEXT("WallpaperDir"), szSearchPath, 0) == ERROR_SUCCESS) + if (SHRegGetPath(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion"), TEXT("WallPaperDir"), szSearchPath, 0) == ERROR_SUCCESS) { i = AddWallpapersFromDirectory(i, hwndBackgroundList, backgroundItem, pData, wallpaperFilename, szSearchPath); }

1 0

[hbelusca] 70723: [SHELL32]: Proper fix for CORE-9837 (see r68283): "Get run icon from shell32", including partial revert and code closer to Wine. CORE-9837 #comment Proper fix in r70723
by hbelusca＠svn.reactos.org 13 Feb '16

13 Feb '16

Author: hbelusca Date: Sat Feb 13 00:16:19 2016 New Revision: 70723 URL: http://svn.reactos.org/svn/reactos?rev=70723&view=rev Log: [SHELL32]: Proper fix for CORE-9837 (see r68283): "Get run icon from shell32", including partial revert and code closer to Wine. CORE-9837 #comment Proper fix in r70723 Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -284,7 +284,6 @@ rfdp.uFlags = uFlags; DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_RUN), hwndOwner, RunDlgProc, (LPARAM)&rfdp); - } @@ -394,10 +393,19 @@ if (prfdp->uFlags & RFF_CALCDIRECTORY) FIXME("RFF_CALCDIRECTORY not supported\n"); + /* Use the default Shell Run icon if no one is specified */ if (prfdp->hIcon == NULL) - prfdp->hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); - SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon); - SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); + prfdp->hIcon = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_RUN)); + /* + * NOTE: Starting Windows Vista, the "Run File" dialog gets a + * title icon that remains the same as the default one, even if + * the user specifies a custom icon. + * Since we currently imitate Windows 2003, therefore do not show + * any title icon. + */ + // SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon); + // SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); EnableOkButtonFromEditContents(hwnd); Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ°Ð¿Ð¸ÑÐµÑÐµ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ, Ð¿Ð°Ð¿ÐºÐ°, Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð¸Ð½ÑÐµÑÐ½ÐµÑ Ð¸Ð·ÑÐ¾ÑÐ½Ð¸Ðº Ð¸ Ð ÐµÐ°ÐºÑÐÐ¡ ÑÐµ Ð³Ð¾ Ð¾ÑÐ²Ð¾ÑÐ¸.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐ²Ð°ÑÑÐ½Ðµ:", 12305, 7, 39, 40, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 180, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 180, 100 DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -162,10 +162,10 @@ CAPTION "Spustit" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Zadejte nÃ¡zev programu, sloÅ¾ky, dokumentu, nebo zdroje v sÃti Internet a ReactOS jej pro vÃ¡s otevÅe.", 12289, 36, 11, 182, 18 LTEXT "&OtevÅÃt:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Storno", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&ProchÃ¡zet...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -162,10 +162,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Indtast navnet pÃ¥ det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal Ã¥bne for dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãbn:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Fortryd", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Gennemse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "AusfÃ¼hren" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 LTEXT "&Ãffnen:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Durchsuchen...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ ÏÎ¿ ÏÎ½Î¿Î¼Î± ÎµÎ½ÏÏ ÏÏÎ¿Î³ÏÎ¬Î¼Î¼Î±ÏÎ¿Ï, ÏÎ±ÎºÎÎ»Î¿Ï, ÎµÎ³Î³ÏÎ¬ÏÎ¿Ï, Î® ÏÏÏÎ¿Ï ÏÎ¿Ï Î´Î¹Î±Î´ÏÎºÏÎ¯Î¿Ï, ÎºÎ±Î¹ ÏÎ¿ ReactOS Î¸Î± ÏÎ¿ Î±Î½Î¿Î¯Î¾ÎµÎ¹.", 12289, 36, 4, 182, 25 LTEXT "Î&Î½Î¿Î¹Î³Î¼Î±:", 12305, 5, 39, 31, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "ÎÎºÏÏÎ¿", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ·...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -158,10 +158,10 @@ CAPTION "Ejecutar" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirÃ¡ para usted.", 12289, 36, 11, 182, 24 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "Aceptar", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Examinar...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Peruuta", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Selaa...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "ExÃ©cuter" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 11, 182, 18 LTEXT "&Ouvrir :", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Parcourir...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "××¤×¢××" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "××§×× ×©× ×©× ×ª××× ××ª, ×ª××§××, ××¡×× ×× ××©×× ××× ××¨× × ×- ReactOS ××¤×ª× ×××ª× ×¢×××¨×.", 12289, 36, 11, 182, 18 LTEXT "&×¤×ª× ××ª:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "×××©××¨", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "×××××", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&×¢×××...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Ãrd be a program nevÃ©t, egy mappÃ¡Ã©t, dokumentumÃ©t, vagy egy Internet cÃmet, Ã©s a ReactOS megnyitja.", 12289, 36, 11, 182, 18 LTEXT "&MegnyitÃ¡s:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "MÃ©gse", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&BÃ¶ngÃ©szÃ©s...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirÃ .", 12289, 36, 11, 182, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Esplora...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 9, "MS UI Gothic" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããææ¸åãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã", 12289, 36, 11, 182, 18 LTEXT "åå(&O):", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "åç§(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 9, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. Wine zal het vervolgens openen.", 12289, 36, 11, 182, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Bladeren...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "KjÃ¸r" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Skriv inn navnet pÃ¥ programmet, mappen, dokumentet etter Internett-ressursen du Ã¸nsker Ã¥ Ã¥pne.", 12289, 36, 11, 182, 18 LTEXT "&Ãpne:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Bla gjennom .", 12288, 170, 63, 54, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -160,10 +160,10 @@ CAPTION "Uruchamianie" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Wpisz nazwÄ programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18 LTEXT "&OtwÃ³rz:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&PrzeglÄdaj...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digite o nome do programa, pasta, documento, ou endereÃ§o Internet, que o ReactOS irÃ¡ abrÃ-lo para vocÃª.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Procurar...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Digite o nome do programa, pasta, documento, ou endereÃ§o Internet, que o ReactOS irÃ¡ abrÃ-lo.", 12289, 36, 11, 182, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Procurar...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -158,10 +158,10 @@ CAPTION "Executare" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "TastaÈi numele unui program, dosar, document, sau a unei resurse de Internet, Ã®n vederea deschiderii Ã®n ReactOS.", 12289, 36, 11, 187, 18 LTEXT "&Deschide:", 12305, 7, 39, 33, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 183, 100 DEFPUSHBUTTON "Con&firmÄ", IDOK, 41, 63, 59, 14, WS_TABSTOP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 103, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Spe&cificareâ¦", 12288, 165, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -158,10 +158,10 @@ CAPTION "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð°Ð¿ÐºÐ¸, Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð¸Ð»Ð¸ ÑÐµÑÑÑÑ ÐÐ½ÑÐµÑÐ½ÐµÑÐ°, Ð¸ ReactOS Ð¾ÑÐºÑÐ¾ÐµÑ Ð¸Ñ.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐºÑÑÑÑ:", 12305, 7, 39, 34, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 176, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 176, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "ÐÐ±&Ð·Ð¾Ñ...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Spustenie" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Zadajte nÃ¡zov programu, prieÄinka, dokumentu alebo internetovÃ©ho zdroja a systÃ©m ReactOS ho otvorÃ.", 12289, 36, 11, 182, 18 LTEXT "&OtvoriÅ¥:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&PrehÄ¾adÃ¡vaÅ¥...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo odprl.", 12289, 36, 11, 182, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "PrekliÄi", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Pre&brskaj", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -160,10 +160,10 @@ CAPTION "EKzekuto" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Shkruaj emrin e njÃ« programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do tÃ« hap atÃ« pÃ«r ju.", 12289, 36, 11, 182, 18 LTEXT "&Hap:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Anulo", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Shfleto...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och wine kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 LTEXT "&Ãppna:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&BlÃ¤ddra...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "ÃalÄ±ÅtÄ±r" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Herhangi bir program, dizin, belge veya Internet kaynaÄÄ± seÃ§in ve ReactOS sizin iÃ§in aÃ§sÄ±n.", 12289, 36, 11, 182, 18 LTEXT "&AÃ§:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "Tamam", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Ä°ptal", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&GÃ¶zat...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -156,10 +156,10 @@ CAPTION "ÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸" FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¼'Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸, ÑÐµÐºÐ¸, Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ° Ð°Ð±Ð¾ ÑÐµÑÑÑÑÑ ÐÐ½ÑÐµÑÐ½ÐµÑÑ, Ñ ReactOS Ð²ÑÐ´ÐºÑÐ¸Ñ ÑÑ.", 12289, 36, 11, 182, 18 LTEXT "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸:", 12305, 3, 39, 32, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Ð&Ð³Ð»ÑÐ´...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -165,10 +165,10 @@ CAPTION "è¿è¡" FONT 9, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "è¾å¥ç¨åºï¼ç®å½ï¼æä»¶æèInternetèµæºåï¼ReactOSå°ä¸ºæ¨æå¼å®ã", 12289, 36, 11, 182, 18 LTEXT "æå¼(&O):", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "ç¡®å®", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "åæ¶", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "æµè§(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -164,10 +164,10 @@ CAPTION "Run" FONT 9, "MS Shell Dlg" BEGIN - ICON IDI_SHELL_RUN, IDC_STATIC, 7, 11, 18, 20, WS_VISIBLE + ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&Browse...", 12288, 160, 63, 59, 14, WS_TABSTOP Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Feb 13 00:16:19 2016 @@ -241,6 +241,7 @@ #define IDD_RUN 1 #define IDC_RUNDLG_DESCRIPTION 12289 #define IDC_RUNDLG_BROWSE 12288 +#define IDC_RUNDLG_ICON 12297 #define IDC_RUNDLG_EDITPATH 12298 #define IDC_RUNDLG_LABEL 12305

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