Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[gedmurphy] 51911: [SHELL32_NEW] - Merge 51127 - Sync RunFileDlg to wine

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 21:05:22 2011 New Revision: 51911 URL: http://svn.reactos.org/svn/reactos?rev=51911&view=rev Log: [SHELL32_NEW] - Merge 51127 - Sync RunFileDlg to wine Modified: branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp branches/shell32_new-bringup/dll/win32/shell32/shell32.spec branches/shell32_new-bringup/dll/win32/shell32/shresdef.h branches/shell32_new-bringup/dll/win32/shell32/undocshell.h Modified: branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp [iso-8859-1] Wed May 25 21:05:22 2011 @@ -49,15 +49,16 @@ UINT i; int size = 0; WCHAR wszFileName[MAX_PATH]; - HGLOBAL hGlobal; + HGLOBAL hGlobal = NULL; DROPFILES *pDropFiles; int offset; LPITEMIDLIST *pidls; TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl); - pidls = (LPITEMIDLIST *)HeapAlloc(GetProcessHeap(), 0, cidl * sizeof *pidls); - if (!pidls) return NULL; + pidls = (LPITEMIDLIST *)HeapAlloc(GetProcessHeap(), 0, cidl * sizeof(*pidls)); + if (!pidls) + goto cleanup; /* get the size needed */ size = sizeof(DROPFILES); @@ -73,7 +74,8 @@ /* Fill the structure */ hGlobal = GlobalAlloc(GHND|GMEM_SHARE, size); - if(!hGlobal) return hGlobal; + if(!hGlobal) + goto cleanup; pDropFiles = (DROPFILES *)GlobalLock(hGlobal); offset = (sizeof(DROPFILES) + sizeof(WCHAR) - 1) / sizeof(WCHAR); @@ -91,7 +93,9 @@ ((WCHAR*)pDropFiles)[offset] = 0; GlobalUnlock(hGlobal); - HeapFree(GetProcessHeap(), 0, pidls); +cleanup: + if(pidls) + HeapFree(GetProcessHeap(), 0, pidls); return hGlobal; } Modified: branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp [iso-8859-1] Wed May 25 21:05:22 2011 @@ -25,17 +25,17 @@ { HWND hwndOwner ; HICON hIcon ; - LPCSTR lpstrDirectory ; - LPCSTR lpstrTitle ; - LPCSTR lpstrDescription ; + LPCWSTR lpstrDirectory ; + LPCWSTR lpstrTitle ; + LPCWSTR lpstrDescription ; UINT uFlags ; } RUNFILEDLGPARAMS ; -typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ; +typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; -static void FillList (HWND, char *) ; +static void FillList (HWND, char *, BOOL) ; /************************************************************************* @@ -261,23 +261,22 @@ } /************************************************************************* - * RunFileDlg [SHELL32.61] + * RunFileDlg [internal] * - * NOTES - * Original name: RunFileDlg (exported by ordinal) + * The Unicode function that is available as ordinal 61 on Windows NT/2000/XP/... */ void WINAPI RunFileDlg( HWND hwndOwner, HICON hIcon, - LPCSTR lpstrDirectory, - LPCSTR lpstrTitle, - LPCSTR lpstrDescription, + LPCWSTR lpstrDirectory, + LPCWSTR lpstrTitle, + LPCWSTR lpstrDescription, UINT uFlags) { - + static const WCHAR resnameW[] = {'S','H','E','L','L','_','R','U','N','_','D','L','G',0}; RUNFILEDLGPARAMS rfdp; HRSRC hRes; - DLGTEMPLATE *templatex; + LPVOID tmplate; TRACE("\n"); rfdp.hwndOwner = hwndOwner; @@ -287,43 +286,107 @@ rfdp.lpstrDescription = lpstrDescription; rfdp.uFlags = uFlags; - if(!(hRes = FindResourceA(shell32_hInstance, "SHELL_RUN_DLG", (LPSTR)RT_DIALOG))) - { - MessageBoxA (hwndOwner, "Couldn't find dialog.", "Nix", MB_OK) ; + if (!(hRes = FindResourceW(shell32_hInstance, resnameW, (LPWSTR)RT_DIALOG)) || + !(tmplate = LoadResource(shell32_hInstance, hRes))) + { + ERR("Couldn't load SHELL_RUN_DLG resource\n"); + ShellMessageBoxW(shell32_hInstance, hwndOwner, MAKEINTRESOURCEW(IDS_RUNDLG_ERROR), NULL, MB_OK | MB_ICONERROR); return; - } - if(!(templatex = (DLGTEMPLATE *)LoadResource(shell32_hInstance, hRes))) - { - MessageBoxA (hwndOwner, "Couldn't load dialog.", "Nix", MB_OK) ; - return; - } - - DialogBoxIndirectParamA((HINSTANCE)GetWindowLongPtrW( hwndOwner, - GWLP_HINSTANCE ), - templatex, hwndOwner, RunDlgProc, (LPARAM)&rfdp); - -} + } + + DialogBoxIndirectParamW(shell32_hInstance, + (LPCDLGTEMPLATEW)tmplate, hwndOwner, RunDlgProc, (LPARAM)&rfdp); + +} + + +/* find the directory that contains the file being run */ +static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) +{ + const WCHAR *src; + WCHAR *dest, *result, *result_end=NULL; + static const WCHAR dotexeW[] = {'.','e','x','e',0}; + + result = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(strlenW(cmdline)+5)); + + src = cmdline; + dest = result; + + if (*src == '"') + { + src++; + while (*src && *src != '"') + { + if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + else { + while (*src) + { + if (isspaceW(*src)) + { + *dest = 0; + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + strcatW(dest, dotexeW); + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + } + else if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + + if (result_end) + { + *result_end = 0; + return result; + } + else + { + HeapFree(GetProcessHeap(), 0, result); + return NULL; + } +} + /* Dialog procedure for RunFileDlg */ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - int ic ; - char *psz, *pdir, szMsg[256]; - static RUNFILEDLGPARAMS *prfdp = NULL ; + RUNFILEDLGPARAMS *prfdp = (RUNFILEDLGPARAMS *)GetWindowLongPtrW(hwnd, DWLP_USER); switch (message) { case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)prfdp); if (prfdp->lpstrTitle) - SetWindowTextA (hwnd, prfdp->lpstrTitle) ; - - SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; - SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, - (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); - FillList (GetDlgItem (hwnd, 12298), NULL) ; - SetFocus (GetDlgItem (hwnd, 12298)) ; + SetWindowTextW(hwnd, prfdp->lpstrTitle); + if (prfdp->lpstrDescription) + SetWindowTextW(GetDlgItem(hwnd, IDC_RUNDLG_DESCRIPTION), prfdp->lpstrDescription); + if (prfdp->uFlags & RFF_NOBROWSE) + { + HWND browse = GetDlgItem(hwnd, IDC_RUNDLG_BROWSE); + ShowWindow(browse, SW_HIDE); + EnableWindow(browse, FALSE); + } + if (prfdp->uFlags & RFF_NOLABEL) + ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_LABEL), SW_HIDE); + if (prfdp->uFlags & RFF_CALCDIRECTORY) + FIXME("RFF_CALCDIRECTORY not supported\n"); + + 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); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); + + FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0) ; + SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)) ; return TRUE ; case WM_COMMAND : @@ -331,46 +394,45 @@ { case IDOK : { - HWND htxt = NULL ; - if ((ic = GetWindowTextLengthA (htxt = GetDlgItem (hwnd, 12298)))) + int ic ; + HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); + if ((ic = GetWindowTextLengthW (htxt))) { - psz = (char *)HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); - GetWindowTextA (htxt, psz, ic + 1) ; - pdir = (char *)HeapAlloc( GetProcessHeap(), 0, (ic + 2) ); - if (pdir) - { - char * ptr; - strcpy(pdir, psz); - ptr = strrchr(pdir + 4, '\\'); - if(ptr) - ptr[0] = '\0'; - else - pdir[3] = '\0'; - } - if (ShellExecuteA(NULL, NULL, psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33) - { - char *pszSysMsg = NULL ; - FormatMessageA ( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError (), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPSTR)&pszSysMsg, 0, NULL - ) ; - sprintf (szMsg, "Error: %s", pszSysMsg) ; - LocalFree ((HLOCAL)pszSysMsg) ; - MessageBoxA (hwnd, szMsg, NULL, MB_OK | MB_ICONEXCLAMATION) ; - + WCHAR *psz, *parent=NULL ; + SHELLEXECUTEINFOW sei ; + + ZeroMemory (&sei, sizeof(sei)) ; + sei.cbSize = sizeof(sei) ; + psz = (WCHAR *)HeapAlloc( GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR) ); + GetWindowTextW (htxt, psz, ic + 1) ; + + /* according to http://www.codeproject.com/KB/shell/runfiledlg.aspx we should send a + * WM_NOTIFY before execution */ + + sei.hwnd = hwnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpFile = psz; + + if (prfdp->lpstrDirectory) + sei.lpDirectory = prfdp->lpstrDirectory; + else + sei.lpDirectory = parent = RunDlg_GetParentDir(sei.lpFile); + + if (!ShellExecuteExW( &sei )) + { HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, pdir); + HeapFree(GetProcessHeap(), 0, parent); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; - } - FillList (htxt, psz) ; + } + + /* FillList is still ANSI */ + GetWindowTextA (htxt, (LPSTR)psz, ic + 1) ; + FillList (htxt, (LPSTR)psz, FALSE) ; + HeapFree(GetProcessHeap(), 0, psz); - HeapFree(GetProcessHeap(), 0, pdir); - EndDialog (hwnd, 0) ; + HeapFree(GetProcessHeap(), 0, parent); + EndDialog (hwnd, 0); } } @@ -378,55 +440,43 @@ EndDialog (hwnd, 0) ; return TRUE ; - case 12288 : + case IDC_RUNDLG_BROWSE : { HMODULE hComdlg = NULL ; LPFNOFN ofnProc = NULL ; - static char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ; - static OPENFILENAMEA ofn = - { - sizeof (OPENFILENAMEA), - NULL, - NULL, - "Executable Files\0*.exe\0All Files\0*.*\0\0\0\0", - NULL, - 0, - 0, - szFName, - 1023, - szFileTitle, - 255, - (LPCSTR)szInitDir, - "Browse", - OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST, - 0, - 0, - NULL, - 0, - (LPOFNHOOKPROC)NULL, - NULL - } ; - - ofn.hwndOwner = hwnd ; - - if (NULL == (hComdlg = LoadLibraryExA ("comdlg32", NULL, 0))) - { - MessageBoxA (hwnd, "Unable to display dialog box (LoadLibraryEx) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ; + static const WCHAR comdlg32W[] = {'c','o','m','d','l','g','3','2',0}; + WCHAR szFName[1024] = {0}; + WCHAR filter[MAX_PATH], szCaption[MAX_PATH]; + OPENFILENAMEW ofn; + + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, MAX_PATH); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); + + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = filter; + ofn.lpstrFile = szFName; + ofn.nMaxFile = 1023; + ofn.lpstrTitle = szCaption; + ofn.Flags = OFN_ENABLESIZING | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + ofn.lpstrInitialDir = prfdp->lpstrDirectory; + + if (NULL == (hComdlg = LoadLibraryExW (comdlg32W, NULL, 0)) || + NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameW"))) + { + ERR("Couldn't get GetOpenFileName function entry (lib=%p, proc=%p)\n", hComdlg, ofnProc); + ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(IDS_RUNDLG_BROWSE_ERROR), NULL, MB_OK | MB_ICONERROR); return TRUE ; - } - - if ((LPFNOFN)NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameA"))) - { - MessageBoxA (hwnd, "Unable to display dialog box (GetProcAddress) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ; - return TRUE ; - } - - ofnProc (&ofn) ; - - SetFocus (GetDlgItem (hwnd, IDOK)) ; - SetWindowTextA (GetDlgItem (hwnd, 12298), szFName) ; - SendMessageA (GetDlgItem (hwnd, 12298), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; - SetFocus (GetDlgItem (hwnd, IDOK)) ; + } + + if (ofnProc(&ofn)) + { + SetFocus (GetDlgItem (hwnd, IDOK)) ; + SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName) ; + SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; + SetFocus (GetDlgItem (hwnd, IDOK)) ; + } FreeLibrary (hComdlg) ; @@ -439,7 +489,8 @@ } /* This grabs the MRU list from the registry and fills the combo for the "Run" dialog above */ -static void FillList (HWND hCb, char *pszLatest) +/* fShowDefault ignored if pszLatest != NULL */ +static void FillList (HWND hCb, char *pszLatest, BOOL fShowDefault) { HKEY hkey ; /* char szDbgMsg[256] = "" ; */ @@ -511,7 +562,7 @@ MessageBoxA (hCb, szDbgMsg, "Nix", MB_OK) ; */ SendMessageA (hCb, CB_ADDSTRING, 0, (LPARAM)pszCmd) ; - if (!Nix) + if (!Nix && fShowDefault) { SetWindowTextA (hCb, pszCmd) ; SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; @@ -609,6 +660,7 @@ return 0; } + /************************************************************************* * LogoffWindowsDialog [SHELL32.54] */ @@ -620,6 +672,7 @@ ExitWindowsEx(EWX_LOGOFF, 0); } return 0;} + /************************************************************************* * RestartDialog [SHELL32.59] Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Èñêàòå ëè äà èçêëþ÷èòå êîìïþòúðà?" IDS_LOGOFF_TITLE "Èçëèçàíå" IDS_LOGOFF_PROMPT "Èñêàòå ëè äà èçëåçåòå?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" // shell folder path default values IDS_PROGRAMS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ" @@ -718,8 +724,8 @@ IDS_RECYCLEBIN_DISKSPACE "Ñâîáîäíî ìÿñòî" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Èçáåðåòå çíà÷å" - IDS_PICK_ICON_FILTER "Ôàéëîâå ñúñ çíà÷åòà(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Èçïúëíèìè ôàéëîâå\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëîâå ñúñ çíà÷åòà (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èçïúëíèìè ôàéëîâå (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Âîäà÷ íà ïðèâèäíî óñòðîéñòâî" IDS_BAT_FILE "Ïàêåòåí ôàéë íà ÐåàêòÎÑ" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -654,6 +654,12 @@ IDS_SHUTDOWN_PROMPT "Opravdu chcete vypnout poèítaè?" IDS_LOGOFF_TITLE "Odhlásit se" IDS_LOGOFF_PROMPT "Opravdu se chcete odhlásit?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Nabídka Start\\Programy" @@ -704,8 +710,8 @@ IDS_RECYCLEBIN_DISKSPACE "Dostupné místo" IDS_EMPTY_BITBUCKET "Vysypat ko" IDS_PICK_ICON_TITLE "Zvolit ikonu" - IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Spustitelné soubory\0*.exe\0" + IDS_PICK_ICON_FILTER "Soubory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Spustitelné soubory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Sloka" IDS_VIRTUAL_DRIVER "Virtuální ovladaè zaøízení" IDS_BAT_FILE "ReactOS dávkový soubor" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -656,6 +656,12 @@ IDS_SHUTDOWN_PROMPT "Ønsker du at Lukke Ned?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programmer" @@ -706,8 +712,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -55,7 +55,7 @@ MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT - MENUITEM "Verknüpfung einfügen", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Einfügen als Verweis", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES END @@ -671,6 +671,12 @@ IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" IDS_LOGOFF_TITLE "Ausloggen" IDS_LOGOFF_PROMPT "Möchten Sie sich ausloggen?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme" @@ -715,14 +721,14 @@ IDS_SHELL_ABOUT_BACK "< &Zurück" FCIDM_SHVIEW_NEW "Neu" FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" - FCIDM_SHVIEW_NEWLINK "Neue &Verknüpfung" + FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" IDS_RECYCLEBIN_DISKSPACE "freier Speicher" IDS_EMPTY_BITBUCKET "Papierkorb leeren" IDS_PICK_ICON_TITLE "Symbol auswählen" - IDS_PICK_ICON_FILTER "Symboldateien(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programme\0*.exe\0" + IDS_PICK_ICON_FILTER "Symboldateien (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programme (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dateiordner" IDS_VIRTUAL_DRIVER "Virtueller Gerätetreiber" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá áðåíåñãïðïéÞóåôå ôïí õðïëïãéóôÞ óáò;" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -718,8 +724,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -678,6 +678,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -728,8 +734,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -680,6 +680,12 @@ IDS_SHUTDOWN_PROMPT "¿Desea apagar el equipo?" IDS_LOGOFF_TITLE "Cerrar sesión" IDS_LOGOFF_PROMPT "¿Desea cerrar la sesión?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menú Inicio\\Programas" @@ -730,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espacio disponible" IDS_EMPTY_BITBUCKET "Vaciar Papelera de reciclaje" IDS_PICK_ICON_TITLE "Seleccione un icono" - IDS_PICK_ICON_FILTER "Archivos de iconos(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programas\0*.exe\0" + IDS_PICK_ICON_FILTER "Archivos de iconos (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programas (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Directorio" IDS_VIRTUAL_DRIVER "Controlador de dispositivo virtual" IDS_BAT_FILE "Archivo por lotes ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Haluatko lopettaa Wine:n istunnon?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Käynnistä\\Ohjelmat" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -671,6 +671,12 @@ IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" IDS_LOGOFF_TITLE "Se déconnecter" IDS_LOGOFF_PROMPT "Voulez-vous vous déconnecter ?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes" @@ -721,8 +727,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espace disponible" IDS_EMPTY_BITBUCKET "Vider la Corbeille" IDS_PICK_ICON_TITLE "Choisir une icône" - IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Fichiers exécutables\0*.exe\0" + IDS_PICK_ICON_FILTER "Fichiers d'icônes (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Fichiers exécutables (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dossier" IDS_VIRTUAL_DRIVER "Pilote de périphérique virtuel" IDS_BAT_FILE "Fichier Batch ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Kiakarod kapcsolni számítógépét?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -678,6 +678,12 @@ IDS_SHUTDOWN_PROMPT "Volete arrestare il sistema?" IDS_LOGOFF_TITLE "Disconnetti" IDS_LOGOFF_PROMPT "Volete disconnettervi?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi" @@ -728,8 +734,8 @@ IDS_RECYCLEBIN_DISKSPACE "Spazio disponibile" IDS_EMPTY_BITBUCKET "Svuota cestino" IDS_PICK_ICON_TITLE "Scegliere un icona" - IDS_PICK_ICON_FILTER "Icone(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "File eseguibili\0*.exe\0" + IDS_PICK_ICON_FILTER "Icone (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "File eseguibili (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Cartella" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Vbg_EµÜ·©?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "pÅ«éÌæ" IDS_EMPTY_BITBUCKET "²Ý ðóÉ·é" IDS_PICK_ICON_TITLE "ACRÌIð" - IDS_PICK_ICON_FILTER "ACRt@C(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "ÀsÂ\\ t@C\0*.exe\0" + IDS_PICK_ICON_FILTER "ACRt@C (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "ÀsÂ\\ t@C (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "tH_" IDS_VIRTUAL_DRIVER "¼z foCX hCo" IDS_BAT_FILE "ReactOS ob` t@C" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Vil du slå av datamaskinen?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Programmer" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "Ledig plass" IDS_EMPTY_BITBUCKET "Tøm papirkurven" IDS_PICK_ICON_TITLE "Velg Ikon" - IDS_PICK_ICON_FILTER "Ikon Fil(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Kjørbare filer\0*.exe\0" + IDS_PICK_ICON_FILTER "Ikon Fil (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Kjørbare filer (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Mappe" IDS_VIRTUAL_DRIVER "Virtuell enhetdriver" IDS_BAT_FILE "ReactOS Batch fil" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -674,6 +674,12 @@ IDS_SHUTDOWN_PROMPT "Czy chcesz wy³¹czyæ system?" IDS_LOGOFF_TITLE "Wyloguj" IDS_LOGOFF_PROMPT "Czy chcesz siê wylogowaæ z systemu?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Nie mogê wywietliæ okna Uruchom (b³¹d wewnêtrzny)" + IDS_RUNDLG_BROWSE_ERROR "Nie mogê wywietliæ okna Przegl¹daj (b³¹d wewnêtrzny)" + IDS_RUNDLG_BROWSE_CAPTION "Przegl¹daj" + IDS_RUNDLG_BROWSE_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Start\\Programy" @@ -724,8 +730,8 @@ IDS_RECYCLEBIN_DISKSPACE "Pozosta³o wolnego miejsca" IDS_EMPTY_BITBUCKET "Opró¿nij Kosz" IDS_PICK_ICON_TITLE "Wybierz ikonê" - IDS_PICK_ICON_FILTER "Pliki ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Programy\0*.exe\0" + IDS_PICK_ICON_FILTER "Pliki ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Wszystkie pliki (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Programy (*.exe)\0*.exe\0Wszystkie pliki (*.*)\0*.*\0" IDS_DIRECTORY "Katalog" IDS_VIRTUAL_DRIVER "Sterownik urz¹dzenia wirtualnego" IDS_BAT_FILE "Plik wsadowy ReactOS" @@ -759,5 +765,5 @@ IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" IDS_COPY_OF "Kopia" - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowane by otwieraæ pliki tego typu." +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -669,6 +669,12 @@ IDS_SHUTDOWN_PROMPT "Você quer finalizar a sessão no Wine?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" @@ -719,8 +725,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessão do ReactOS?" IDS_LOGOFF_TITLE "Terminar a sessão" IDS_LOGOFF_PROMPT "Pretende terminar a sessão?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "Espaço Disponível" IDS_EMPTY_BITBUCKET "Esvaziar Reciclagem" IDS_PICK_ICON_TITLE "Escolha Ícone" - IDS_PICK_ICON_FILTER "Ficheiros de Ícones(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Ficheiros Executáveis\0*.exe\0" + IDS_PICK_ICON_FILTER "Ficheiros de Ícones (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Ficheiros Executáveis (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Pasta" IDS_VIRTUAL_DRIVER "Driver de Dispositivo Virtual" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -670,6 +670,12 @@ IDS_SHUTDOWN_PROMPT "VreÈi sÄ Ã®nchideÈi computerul?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Meniu Start\\Programe" @@ -720,8 +726,8 @@ IDS_RECYCLEBIN_DISKSPACE "SpaÈiu disponibil" IDS_EMPTY_BITBUCKET "Golire CoÈ de gunoi" IDS_PICK_ICON_TITLE "Alegere pictogramÄ" - IDS_PICK_ICON_FILTER "FiÈiere pictogramÄ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "FiÈiere executabile\0*.exe\0" + IDS_PICK_ICON_FILTER "FiÈiere pictogramÄ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "FiÈiere executabile (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Dosar" IDS_VIRTUAL_DRIVER "Driver dispozitiv virtual" IDS_BAT_FILE "FiÈier serie de comenzi ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -666,6 +666,12 @@ IDS_SHUTDOWN_PROMPT "Çàêîí÷èòü ðàáîòó ñ ReactOS?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -716,8 +722,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíîå ïðîñòðàíñòâî" IDS_EMPTY_BITBUCKET "Î÷èñòèòü êîðçèíó" IDS_PICK_ICON_TITLE "Âûáðàòü çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëû çíà÷êîâ (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Èñïîëíÿåìûå ôàéëû (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð âèðòóàëüíîãî óñòðîéñòâà" IDS_BAT_FILE "Ïàêåòíûé ôàéë ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -673,6 +673,12 @@ IDS_SHUTDOWN_PROMPT "Naozaj chcete vypnú poèítaè?" IDS_LOGOFF_TITLE "Odhlási" IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlási?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ponuka tart\\Programy" @@ -723,8 +729,8 @@ IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" IDS_EMPTY_BITBUCKET "Vyprázdni Kô" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Súbory ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Spustite¾né súbory\0*.exe\0" + IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Spustite¾né súbory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Prieèinok" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "Dávkový súbor systému ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -667,6 +667,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programlar" @@ -717,8 +723,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -680,6 +680,12 @@ IDS_SHUTDOWN_PROMPT "Âè õî÷åòå âèìêíóòè êîìï'þòåð?" IDS_LOGOFF_TITLE "Âèõ³ä ç ñèñòåìè" IDS_LOGOFF_PROMPT "Âè õî÷åòå âèéòè ç ñèñòåìè?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -730,8 +736,8 @@ IDS_RECYCLEBIN_DISKSPACE "Äîñòóïíèé ïðîñò³ð" IDS_EMPTY_BITBUCKET "Î÷èñòèòè Êîøèê" IDS_PICK_ICON_TITLE "Âèáðàòè çíà÷îê" - IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè\0*.exe\0" + IDS_PICK_ICON_FILTER "Ôàéëè çíà÷ê³â (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Âèêîíóâàí³ ôàéëè (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Ïàïêà" IDS_VIRTUAL_DRIVER "Äðàéâåð â³ðòóàëüíîãî ïðèñòðîþ" IDS_BAT_FILE "Ïàêåòíèé ôàéë ReactOS" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -656,6 +656,12 @@ IDS_SHUTDOWN_PROMPT "ÊÇ·ñ¹Ø±ÕÏµÍ³?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -705,8 +711,8 @@ IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed May 25 21:05:22 2011 @@ -668,6 +668,12 @@ IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" IDS_LOGOFF_TITLE "Log Off" IDS_LOGOFF_PROMPT "Do you want to log off?" + + /* Run File dialog */ + IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" + IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" + IDS_RUNDLG_BROWSE_CAPTION "Browse" + IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" @@ -718,8 +724,8 @@ IDS_RECYCLEBIN_DISKSPACE "Space Available" IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" + IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" IDS_DIRECTORY "Folder" IDS_VIRTUAL_DRIVER "Virtual Device Driver" IDS_BAT_FILE "ReactOS Batch File" Modified: branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] Wed May 25 21:05:22 2011 @@ -411,8 +411,8 @@ void BrowseForApplication(HWND hwndDlg) { - WCHAR szBuffer[30] = {0}; - WCHAR szFilter[30] = {0}; + WCHAR szBuffer[64] = {0}; + WCHAR szFilter[256] = {0}; WCHAR szPath[MAX_PATH]; OPENFILENAMEW ofn; OPEN_WITH_CONTEXT Context; Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1] Wed May 25 21:05:22 2011 @@ -58,9 +58,9 @@ 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW # Fixme 59 stdcall RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) # Fixme -61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlg # Fixme +61 stdcall -noname RunFileDlg(long long long wstr wstr long) RunFileDlg # Fixme? 62 stdcall PickIconDlg(long long long long) -63 stdcall GetFileNameFromBrowse(long long long long str str str) +63 stdcall GetFileNameFromBrowse(long long long long wstr wstr wstr) 64 stdcall DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall IsNetDrive(long) Modified: branches/shell32_new-bringup/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] Wed May 25 21:05:22 2011 @@ -142,6 +142,11 @@ #define IDS_FILE_TYPES 174 #define IDS_FILE_DETAILS 175 +#define IDS_RUNDLG_ERROR 180 +#define IDS_RUNDLG_BROWSE_ERROR 181 +#define IDS_RUNDLG_BROWSE_CAPTION 182 +#define IDS_RUNDLG_BROWSE_FILTER 183 + #define IDS_OPEN_VERB 300 #define IDS_EXPLORE_VERB 301 #define IDS_RUNAS_VERB 302 @@ -195,6 +200,13 @@ #define SHELL_EXTENDED_SHORTCUT_DLG 0x4000 #define OPEN_WITH_PROGRAMM_DLG 0x4001 #define IDD_SH_FILE_COPY 0x4002 + +/* run dialog */ +#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 /* ID's of the ShellAbout controls */ // Part 1 - ID's identical to Windows Server 2003 SP1's shell32.dll Modified: branches/shell32_new-bringup/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/undocshell.h [iso-8859-1] Wed May 25 21:05:22 2011 @@ -70,6 +70,16 @@ BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); + +/**************************************************************************** +* SHChangeNotifyRegister API +*/ +#define SHCNRF_InterruptLevel 0x0001 +#define SHCNRF_ShellLevel 0x0002 +#define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */ +#define SHCNRF_NewDelivery 0x8000 /* Messages use shared memory */ + + /**************************************************************************** * Shell Common Dialogs */ @@ -100,9 +110,9 @@ void WINAPI RunFileDlg( HWND hwndOwner, HICON hIcon, - LPCSTR lpstrDirectory, - LPCSTR lpstrTitle, - LPCSTR lpstrDescription, + LPCWSTR lpstrDirectory, + LPCWSTR lpstrTitle, + LPCWSTR lpstrDescription, UINT uFlags); void WINAPI ExitWindowsDialog(HWND hwndOwner);

13 years, 7 months

[gedmurphy] 51910: [SHELL32_NEW] - Merge 50899, 50941, 50957, 50964, 51053 - Check the correct pidl instead of the free one - Found by the amazing DPH! - Return the icon index, not the icon id -Fix...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 20:36:21 2011 New Revision: 51910 URL: http://svn.reactos.org/svn/reactos?rev=51910&view=rev Log: [SHELL32_NEW] - Merge 50899, 50941, 50957, 50964, 51053 - Check the correct pidl instead of the free one - Found by the amazing DPH! - Return the icon index, not the icon id -Fix missing "Open" menu entry on right click for All Users desktop shortcuts. Modified: branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp [iso-8859-1] Wed May 25 20:36:21 2011 @@ -47,26 +47,26 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) { UINT i; - int rootlen = 0,size = 0; - WCHAR wszRootPath[MAX_PATH]; + int size = 0; WCHAR wszFileName[MAX_PATH]; HGLOBAL hGlobal; DROPFILES *pDropFiles; int offset; - - TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl); + LPITEMIDLIST *pidls; + + TRACE("(%p,%p,%u)\n", pidlRoot, apidl, cidl); + + pidls = (LPITEMIDLIST *)HeapAlloc(GetProcessHeap(), 0, cidl * sizeof *pidls); + if (!pidls) return NULL; /* get the size needed */ size = sizeof(DROPFILES); - SHGetPathFromIDListW(pidlRoot, wszRootPath); - PathAddBackslashW(wszRootPath); - rootlen = wcslen(wszRootPath); - for (i=0; i<cidl;i++) { - _ILSimpleGetTextW(apidl[i], wszFileName, MAX_PATH); - size += (rootlen + wcslen(wszFileName) + 1) * sizeof(WCHAR); + pidls[i] = ILCombine(pidlRoot, apidl[i]); + SHGetPathFromIDListW(pidls[i], wszFileName); + size += (wcslen(wszFileName) + 1) * sizeof(WCHAR); } size += sizeof(WCHAR); @@ -80,18 +80,18 @@ pDropFiles->pFiles = offset * sizeof(WCHAR); pDropFiles->fWide = TRUE; - wcscpy(wszFileName, wszRootPath); - for (i=0; i<cidl;i++) { - - _ILSimpleGetTextW(apidl[i], wszFileName + rootlen, MAX_PATH - rootlen); + SHGetPathFromIDListW(pidls[i], wszFileName); wcscpy(((WCHAR*)pDropFiles)+offset, wszFileName); offset += wcslen(wszFileName) + 1; + ILFree(pidls[i]); } ((WCHAR*)pDropFiles)[offset] = 0; GlobalUnlock(hGlobal); + + HeapFree(GetProcessHeap(), 0, pidls); return hGlobal; } Modified: branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/dialogs.cpp [iso-8859-1] Wed May 25 20:36:21 2011 @@ -63,7 +63,7 @@ PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u\n", lpszName); + swprintf(szName, L"%u", lpszName); else wcscpy(szName, (WCHAR*)lpszName); @@ -105,7 +105,7 @@ LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; HICON hIcon; - INT index; + INT index, count; WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; OPENFILENAMEW ofn = {0}; @@ -123,18 +123,21 @@ else SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); - swprintf(szText, L"%u", pIconContext->Index); - index = SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRING, -1, (LPARAM)szText); - if (index != LB_ERR) - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, index, 0); + count = SendMessage(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); + if (count != LB_ERR) + { + if (count > pIconContext->Index) + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + else + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + } return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - SendMessageW(pIconContext->hDlgCtrl, LB_GETTEXT, index, (LPARAM)szText); - pIconContext->Index = _wtoi(szText); + pIconContext->Index = index; SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_GETTEXT, MAX_PATH, (LPARAM)pIconContext->szName); DestroyIconList(pIconContext->hDlgCtrl); EndDialog(hwndDlg, 1); Modified: branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp [iso-8859-1] Wed May 25 20:36:21 2011 @@ -183,8 +183,8 @@ if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail; if (!MaskBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight, ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight, - ShortcutDC, 0, 0, ShortcutIconInfo.hbmMask, 0, 0, - MAKEROP4(SRCCOPY, 0xAA0000))) + ShortcutDC, 0, 0, ShortcutIconInfo.hbmMask, 0, 0, + MAKEROP4(0xAA0000, SRCCOPY))) { goto fail; } Modified: branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp [iso-8859-1] Wed May 25 20:36:21 2011 @@ -1059,8 +1059,8 @@ ERR("no mem\n"); return E_OUTOFMEMORY; } - if (_ILIsDesktop(pidl_child) || _ILIsMyDocuments(pidl_child) || _ILIsControlPanel(pidl_child) || _ILIsNetHood(pidl_child) || - _ILIsBitBucket(pidl_child) || _ILIsDrive(pidl_child) || _ILIsCPanelStruct(pidl_child) || _ILIsFolder(pidl_child) || _ILIsControlPanel(pidl_folder)) + if (_ILIsDesktop(pidl) || _ILIsMyDocuments(pidl) || _ILIsControlPanel(pidl) || _ILIsNetHood(pidl) || + _ILIsBitBucket(pidl) || _ILIsDrive(pidl) || _ILIsCPanelStruct(pidl) || _ILIsFolder(pidl) || _ILIsControlPanel(pidl)) { TRACE("pidl is a folder\n"); SHFree((void*)pidl); Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed May 25 20:36:21 2011 @@ -1712,7 +1712,7 @@ case LVN_ENDLABELEDITW: { - TRACE("-- LVN_ENDLABELEDITA %p\n", this); + TRACE("-- LVN_ENDLABELEDITW %p\n", this); if (lpdi->item.pszText) { HRESULT hr;

13 years, 7 months

[gedmurphy] 51909: [SHELL32_NEW] - Merge 50114 and 50144 - Add NULL checks in IShellView and IDropTarget implementations. Should fix bug #5780. - Bug 5756: TRANSLATION: multiple modules: Bulgarian ...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 20:25:42 2011 New Revision: 51909 URL: http://svn.reactos.org/svn/reactos?rev=51909&view=rev Log: [SHELL32_NEW] - Merge 50114 and 50144 - Add NULL checks in IShellView and IDropTarget implementations. Should fix bug #5780. - Bug 5756: TRANSLATION: multiple modules: Bulgarian by CCTAHEB Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed May 25 20:25:42 2011 @@ -666,8 +666,8 @@ IDS_RESTART_PROMPT "Èñêàòå ëè äà ïðåçàïóñíåòå ñèñòåìàòà?" IDS_SHUTDOWN_TITLE "Èçêëþ÷âàíå" IDS_SHUTDOWN_PROMPT "Èñêàòå ëè äà èçêëþ÷èòå êîìïþòúðà?" - IDS_LOGOFF_TITLE "Log Off" - IDS_LOGOFF_PROMPT "Do you want to log off?" + IDS_LOGOFF_TITLE "Èçëèçàíå" + IDS_LOGOFF_PROMPT "Èñêàòå ëè äà èçëåçåòå?" // shell folder path default values IDS_PROGRAMS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ" @@ -751,11 +751,11 @@ IDS_INSTALLNEWFONT "Ñëàãàíå íà íîâ øðèôò..." IDS_DEFAULT_CLUSTER_SIZE "Ïîäðàçáèðàí ðàçïðåäåëèòåëåí ðàçìåð" - IDS_COPY_OF "Copy of" - - IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END - - - - + IDS_COPY_OF "Ïðåçàïèñ íà" + + IDS_SHLEXEC_NOASSOC "Íÿìà ïðèëîæåíèå çà Óèíäîóñ, íàñòðîåíî äà îòâàðÿ òîçè âèä ôàéëîâå." +END + + + + Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed May 25 20:25:42 2011 @@ -1928,8 +1928,6 @@ { ERR("no IID_ISFHelper for destination\n"); - //IShellFolder_Release(psfFrom); - //IShellFolder_Release(psfTarget); SHFree(pidl); _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); @@ -1941,9 +1939,6 @@ { ERR("no IID_ISFHelper for source\n"); - //ISFHelper_Release(psfhlpdst); - ///IShellFolder_Release(psfFrom); - //IShellFolder_Release(psfTarget); SHFree(pidl); _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); @@ -1955,13 +1950,10 @@ */ hr = psfhlpdst->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); - //ISFHelper_Release(psfhlpdst); - //ISFHelper_Release(psfhlpsrc); - //IShellFolder_Release(psfFrom); SHFree(pidl); _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); - //IDataObject_Release(pda); + TRACE("paste end hr %x\n", hr); break; } @@ -2134,7 +2126,15 @@ *phWnd = 0; TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd); - TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); + + if (lpfs != NULL) + TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); + if (prcView != NULL) + TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom); + + /* Validate the Shell Browser */ + if (psb == NULL) + return E_UNEXPECTED; /*set up the member variables*/ pShellBrowser = psb; @@ -2513,7 +2513,12 @@ pCurDropTarget->DragLeave(); pCurDropTarget.Release(); } - pCurDataObject.Release(); + + if (pCurDataObject != NULL) + { + pCurDataObject.Release(); + } + iDragOverItem = 0; return S_OK;

13 years, 7 months

[gedmurphy] 51908: [SHELL32_NEW] - Merge 49969, refactored to use CComPtr's thanks to the new C++ model (it's sooo much cleaner now) - Implement copy / paste for files when tree view is present - D...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 20:12:34 2011 New Revision: 51908 URL: http://svn.reactos.org/svn/reactos?rev=51908&view=rev Log: [SHELL32_NEW] - Merge 49969, refactored to use CComPtr's thanks to the new C++ model (it's sooo much cleaner now) - Implement copy / paste for files when tree view is present - Don't add shortcuts / executables to recent file list Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1] Wed May 25 20:12:34 2011 @@ -685,6 +685,7 @@ CHAR link_dir[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_name[MAX_PATH]; + CHAR * ext; CComPtr<IMalloc> ppM; LPITEMIDLIST pidl; HWND hwnd = 0; /* FIXME: get real window handle */ @@ -817,6 +818,23 @@ } TRACE("full document name %s\n", debugstr_a(doc_name)); + + /* check if file is a shortcut */ + ext = strrchr(doc_name, '.'); + if (!lstrcmpiA(ext, ".lnk")) + { + CComPtr<IShellLinkA> ShellLink; + IShellLink_ConstructFromFile(NULL, IID_IShellLinkA, (LPCITEMIDLIST)SHSimpleIDListFromPathA(doc_name), (LPVOID*)&ShellLink); + ShellLink->GetPath(doc_name, MAX_PATH, NULL, 0); + } + + ext = strrchr(doc_name, '.'); + if (!lstrcmpiA(ext, ".exe")) + { + /* executables are not added */ + return; + } + PathStripPathA(doc_name); TRACE("stripped document name %s\n", debugstr_a(doc_name)); Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed May 25 20:12:34 2011 @@ -1831,11 +1831,139 @@ } else if(plvKeyDown->wVKey == 'C' && ctrl) { - FIXME("Need to copy\n"); + if (GetSelections()) + { + CComPtr<IDataObject> pda; + + if (SUCCEEDED(pSFParent->GetUIObjectOf(m_hWnd, cidl, (LPCITEMIDLIST*)apidl, IID_IDataObject, 0, (LPVOID *)&pda))) + { + HRESULT hr = OleSetClipboard(pda); + if (FAILED(hr)) + { + WARN("OleSetClipboard failed"); + } + } + } + break; } else if(plvKeyDown->wVKey == 'V' && ctrl) { - FIXME("Need to paste\n"); + CComPtr<IDataObject> pda; + STGMEDIUM medium; + FORMATETC formatetc; + LPITEMIDLIST * apidl; + LPITEMIDLIST pidl; + CComPtr<IShellFolder> psfFrom; + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfTarget; + LPIDA lpcida; + CComPtr<ISFHelper> psfhlpdst; + CComPtr<ISFHelper> psfhlpsrc; + HRESULT hr; + + hr = OleGetClipboard(&pda); + if (hr != S_OK) + { + ERR("Failed to get clipboard with %lx\n", hr); + return E_FAIL; + } + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + hr = pda->GetData(&formatetc, &medium); + + if (FAILED(hr)) + { + ERR("Failed to get clipboard data with %lx\n", hr); + return E_FAIL; + } + + /* lock the handle */ + lpcida = (LPIDA)GlobalLock(medium.hGlobal); + if (!lpcida) + { + ERR("failed to lock pidl\n"); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* convert the data into pidl */ + apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + + if (!apidl) + { + ERR("failed to copy pidl\n"); + return E_FAIL; + } + + if (FAILED(SHGetDesktopFolder(&psfDesktop))) + { + ERR("failed to get desktop folder\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + if (_ILIsDesktop(pidl)) + { + /* use desktop shellfolder */ + psfFrom = psfDesktop; + } + else if (FAILED(psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom))) + { + ERR("no IShellFolder\n"); + + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + + return E_FAIL; + } + + psfTarget = pSFParent; + + + /* get source and destination shellfolder */ + if (FAILED(psfTarget->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpdst))) + { + ERR("no IID_ISFHelper for destination\n"); + + //IShellFolder_Release(psfFrom); + //IShellFolder_Release(psfTarget); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + + return E_FAIL; + } + + if (FAILED(psfFrom->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpsrc))) + { + ERR("no IID_ISFHelper for source\n"); + + //ISFHelper_Release(psfhlpdst); + ///IShellFolder_Release(psfFrom); + //IShellFolder_Release(psfTarget); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + return E_FAIL; + } + + /* FIXXME + * do we want to perform a copy or move ??? + */ + hr = psfhlpdst->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + + //ISFHelper_Release(psfhlpdst); + //ISFHelper_Release(psfhlpsrc); + //IShellFolder_Release(psfFrom); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + //IDataObject_Release(pda); + TRACE("paste end hr %x\n", hr); + break; } else FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);

13 years, 7 months

[gedmurphy] 51907: [LOGONUI] Add gabriel's fixed bitmap and a more forgiving rbuild file

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 18:53:04 2011 New Revision: 51907 URL: http://svn.reactos.org/svn/reactos?rev=51907&view=rev Log: [LOGONUI] Add gabriel's fixed bitmap and a more forgiving rbuild file Modified: trunk/reactos/base/system/logonui/logonui.rbuild trunk/reactos/base/system/logonui/res/100.bmp Modified: trunk/reactos/base/system/logonui/logonui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/logonu… ============================================================================== --- trunk/reactos/base/system/logonui/logonui.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/logonui/logonui.rbuild [iso-8859-1] Wed May 25 18:53:04 2011 @@ -1,9 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="logonui" type="win32gui" installbase="system32" installname="LogonUI.exe" unicode="yes"> +<module name="logonui" type="win32gui" installbase="system32" installname="LogonUI.exe" allowwarnings="true" unicode="yes"> <include base="logonui">.</include> <library>user32</library> <library>gdi32</library> + <library>msimg32.lib</library> <file>logonui.c</file> <file>NT5design.c</file> <file>NT6design.c</file> Modified: trunk/reactos/base/system/logonui/res/100.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/10… ============================================================================== Binary files - no diff available.

13 years, 7 months

[gedmurphy] 51906: [LOGONUI] - Start to put together the logon / logoff user interface process - It currently paints an exact pixel replica of WinXP's welcome screen in a logging off state - Just a...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed May 25 17:13:54 2011 New Revision: 51906 URL: http://svn.reactos.org/svn/reactos?rev=51906&view=rev Log: [LOGONUI] - Start to put together the logon / logoff user interface process - It currently paints an exact pixel replica of WinXP's welcome screen in a logging off state - Just a bit of fun at the moment, but will be part of the UI revamp we're all working towards. Added: trunk/reactos/base/system/logonui/ (with props) trunk/reactos/base/system/logonui/NT5design.c (with props) trunk/reactos/base/system/logonui/NT6design.c (with props) trunk/reactos/base/system/logonui/lang/ (with props) trunk/reactos/base/system/logonui/lang/en-US.rc (with props) trunk/reactos/base/system/logonui/logonui.c (with props) trunk/reactos/base/system/logonui/logonui.h (with props) trunk/reactos/base/system/logonui/logonui.rbuild (with props) trunk/reactos/base/system/logonui/logonui.rc (with props) trunk/reactos/base/system/logonui/res/ (with props) trunk/reactos/base/system/logonui/res/100.bmp (with props) trunk/reactos/base/system/logonui/res/123.bmp (with props) trunk/reactos/base/system/logonui/res/125.bmp (with props) trunk/reactos/base/system/logonui/res/126.bmp (with props) trunk/reactos/base/system/logonui/res/unknown.bmp (with props) trunk/reactos/base/system/logonui/res/unknown2.bmp (with props) trunk/reactos/base/system/logonui/resource.h (with props) trunk/reactos/base/system/logonui/rsrc.rc (with props) Propchange: trunk/reactos/base/system/logonui/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 25 17:13:54 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/logonui/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/logonui/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/logonui/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/logonui/NT5design.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/NT5des… ============================================================================== --- trunk/reactos/base/system/logonui/NT5design.c (added) +++ trunk/reactos/base/system/logonui/NT5design.c [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,354 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Logon User Interface Host + * FILE: subsys/system/logonui/NT5design.c + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +#include "logonui.h" + + +/* GLOBALS ******************************************************************/ + +#define NT5_TOP_BORDER_HEIGHT 80 +#define NT5_BOTTOM_BORDER_HEIGHT 96 + + +/* FUNCTIONS ****************************************************************/ + +static VOID +NT5_DrawLogoffCaptionText(LPWSTR lpText, + HDC hdcMem) +{ + HFONT hFont; + LOGFONTW LogFont; + RECT TextRect; + INT PrevBkMode; + + /* Setup the font we'll use */ + ZeroMemory(&LogFont, sizeof(LOGFONTW)); + LogFont.lfCharSet = DEFAULT_CHARSET; + LogFont.lfHeight = 22; + LogFont.lfWeight = 109; // From WinXP disassembly + wcscpy_s(LogFont.lfFaceName, LF_FACESIZE, L"Arial"); + + /* Create it */ + hFont = CreateFontIndirectW(&LogFont); + if (hFont) + { + /* Set the font and font colour */ + SelectObject(hdcMem, hFont); + SetTextColor(hdcMem, RGB(255, 255, 255)); + + /* Create the text rect */ + TextRect.top = (g_pInfo->cy / 2) + 34; + TextRect.bottom = (g_pInfo->cy / 2) + 34 + (GetDeviceCaps(hdcMem, LOGPIXELSY)); + TextRect.left = g_pInfo->cx / 3; + TextRect.right = (g_pInfo->cx / 2) + 35 + 137; + + /* Set the background mode to transparent */ + PrevBkMode = SetBkMode(hdcMem, TRANSPARENT); + + /* Draw the text to the mem DC */ + DrawTextW(hdcMem, + lpText, + -1, + &TextRect, + DT_NOPREFIX | DT_WORDBREAK | DT_RIGHT); // WinXP disassembly uses 0x812 + + /* Set the previous background mode */ + SetBkMode(hdcMem, PrevBkMode); + + /* Delete the font */ + DeleteObject(hFont); + } +} + +static VOID +NT5_DrawLogoffIcon(HDC hdcMem) +{ + HBITMAP hBitmap; + BITMAP bitmap; + HDC hTempDC; + + /* Load the XP logo */ + hBitmap = (HBITMAP)LoadImageW(g_pInfo->hInstance, + MAKEINTRESOURCEW(IDB_MAIN_ROS_LOGO), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (hBitmap) + { + /* Get the bitmap dimensions */ + GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); + + /* Create a temp DC for the bitmap */ + hTempDC = CreateCompatibleDC(hdcMem); + if (hTempDC) + { + /* Select the bitmap onto the temp DC */ + SelectObject(hTempDC, hBitmap); + + /* Paint it onto the centre block */ + BitBlt(hdcMem, + (g_pInfo->cx / 2) + 35, + (g_pInfo->cy / 2) - 72, + bitmap.bmWidth, + bitmap.bmHeight, + hTempDC, + 0, + 0, + SRCCOPY); + + /* Delete the DC */ + DeleteDC(hTempDC); + } + + /* Delete the bitmap */ + DeleteObject(hBitmap); + } +} + +VOID +NT5_RefreshLogoffScreenText(LPWSTR lpText, + HDC hdcMem) +{ + /* FIXME: clear previous text */ + + /* Draw the new text */ + NT5_DrawLogoffCaptionText(lpText, hdcMem); +} + +VOID +NT5_CreateLogoffScreen(LPWSTR lpText, + HDC hdcMem) +{ + /* Draw the reactos logo */ + NT5_DrawLogoffIcon(hdcMem); + + /* Draw the first text string */ + NT5_DrawLogoffCaptionText(lpText, hdcMem); +} + +HDC +NT5_DrawBaseBackground(HDC hdcDesktop) +{ + HBITMAP hBitmap = NULL; + HDC hdcMem = NULL; + BOOL bRet = FALSE; + + + /* Create an an off screen DC to match the desktop DC */ + hdcMem = CreateCompatibleDC(hdcDesktop); + if (hdcMem) + { + /* Create a bitmap to draw the logoff screen onto */ + hBitmap = CreateCompatibleBitmap(hdcDesktop, g_pInfo->cx, g_pInfo->cy); + if (hBitmap) + { + /* Select it onto our off screen DC*/ + SelectObject(hdcMem, hBitmap); + + /* Draw the centre block */ + { + HBITMAP hTempBitmap; + HBRUSH hBrush; + BITMAP bitmap; + HDC hTempDC; + + /* Paint the blue centre block */ + hBrush = CreateSolidBrush(RGB(90, 126, 220)); + SelectObject(hdcMem, hBrush); + PatBlt(hdcMem, + 0, + NT5_TOP_BORDER_HEIGHT, + g_pInfo->cx, + g_pInfo->cy - NT5_TOP_BORDER_HEIGHT - NT5_BOTTOM_BORDER_HEIGHT, + PATCOPY); + DeleteObject(hBrush); + + /* Load the shine effect */ + hTempBitmap = (HBITMAP)LoadImageW(g_pInfo->hInstance, + MAKEINTRESOURCEW(IDB_MAIN_PANEL_SHINE), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (hTempBitmap) + { + /* Get the bitmap dimensions */ + GetObjectW(hTempBitmap, sizeof(BITMAP), &bitmap); + + /* Create a temp DC for the bitmap */ + hTempDC = CreateCompatibleDC(hdcDesktop); + if (hTempDC) + { + /* Select the bitmap onto the temp DC */ + SelectObject(hTempDC, hTempBitmap); + + /* Paint it onto the top left of the centre block */ + BitBlt(hdcMem, + 0, + NT5_TOP_BORDER_HEIGHT, + bitmap.bmWidth, + bitmap.bmHeight, + hTempDC, + 0, + 0, + SRCCOPY); + + /* Delete the DC */ + DeleteDC(hTempDC); + } + + /* Delete the bitmap */ + DeleteObject(hTempBitmap); + } + } + + /* Draw the top border */ + { + HBITMAP hTempBitmap; + HBRUSH hBrush; + BITMAP bitmap; + HDC hTempDC; + + /* Create the blue brush and paint the top bar */ + hBrush = CreateSolidBrush(RGB(0, 48, 156)); + SelectObject(hdcMem, hBrush); + PatBlt(hdcMem, 0, 0, g_pInfo->cx, NT5_TOP_BORDER_HEIGHT, PATCOPY); + DeleteObject(hBrush); + + /* Load the top divider strip */ + hTempBitmap = (HBITMAP)LoadImageW(g_pInfo->hInstance, + MAKEINTRESOURCEW(IDB_TOP_DIVIDER_STRIP), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (hTempBitmap) + { + /* Get the bitmap dimensions */ + GetObjectW(hTempBitmap, sizeof(BITMAP), &bitmap); + + /* Create a temp DC for the bitmap */ + hTempDC = CreateCompatibleDC(hdcDesktop); + if (hTempDC) + { + /* Select the bitmap onto the temp DC */ + SelectObject(hTempDC, hTempBitmap); + + /* Paint the bitmap */ + StretchBlt(hdcMem, + 0, + NT5_TOP_BORDER_HEIGHT - bitmap.bmHeight, + g_pInfo->cx, + NT5_TOP_BORDER_HEIGHT, + hTempDC, + 0, + 0, + bitmap.bmWidth, + NT5_TOP_BORDER_HEIGHT, + SRCCOPY); + + /* Delete the DC */ + DeleteDC(hTempDC); + } + + /* Delete the bitmap */ + DeleteObject(hTempBitmap); + } + } + + /* Draw the bottom border */ + { + HBITMAP hTempBitmap; + TRIVERTEX vertex[2]; + GRADIENT_RECT gRect; + BITMAP bitmap; + HDC hTempDC; + + /* + * We paint the divider strip first as it's 3 + * pixels high but MS only show 2 of them. + */ + + /* Load the bottom divider strip */ + hTempBitmap = (HBITMAP)LoadImage(g_pInfo->hInstance, + MAKEINTRESOURCE(IDB_BOTTOM_DIVIDER_STRIP), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + if (hTempBitmap) + { + /* Get the bitmap dimensions */ + GetObjectW(hTempBitmap, sizeof(BITMAP), &bitmap); + + /* Create a temp DC for the bitmap */ + hTempDC = CreateCompatibleDC(hdcDesktop); + if (hTempDC) + { + /* Select the bitmap onto the temp DC */ + SelectObject(hTempDC, hTempBitmap); + + /* Paint the bitmap */ + StretchBlt(hdcMem, + 0, + g_pInfo->cy - NT5_BOTTOM_BORDER_HEIGHT, + g_pInfo->cx, + g_pInfo->cy - NT5_BOTTOM_BORDER_HEIGHT + bitmap.bmHeight, + hTempDC, + 0, + 0, + bitmap.bmWidth, + g_pInfo->cy - NT5_BOTTOM_BORDER_HEIGHT + bitmap.bmHeight, + SRCCOPY); + + /* Delete the DC */ + DeleteDC(hTempDC); + } + + /* Delete the bitmap */ + DeleteObject(hTempBitmap); + } + + /* Setup the left hand vertex */ + vertex[0].x = 0; + vertex[0].y = g_pInfo->cy - NT5_BOTTOM_BORDER_HEIGHT + 2; // paint over 1 pixel of the bitmap + vertex[0].Red = 0x3900; + vertex[0].Green = 0x3400; + vertex[0].Blue = 0xAE00; + vertex[0].Alpha = 0x0000; + + /* Setup the right hand vertex */ + vertex[1].x = g_pInfo->cx; + vertex[1].y = g_pInfo->cy; + vertex[1].Red = 0x0000; + vertex[1].Green = 0x3000; + vertex[1].Blue = 0x9600; + vertex[1].Alpha = 0x0000; + + /* Set the vertex structs */ + gRect.UpperLeft = 0; + gRect.LowerRight = 1; + + /* Paint the gradient across the bottom */ + GradientFill(hdcMem, + vertex, + 2, + &gRect, + 1, + GRADIENT_FILL_RECT_H); + } + + /* Delete the bitmap */ + DeleteObject(hBitmap); + } + } + + return hdcMem; +} + +/* EOF */ Propchange: trunk/reactos/base/system/logonui/NT5design.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/NT6design.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/NT6des… ============================================================================== --- trunk/reactos/base/system/logonui/NT6design.c (added) +++ trunk/reactos/base/system/logonui/NT6design.c [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Logon User Interface Host + * FILE: subsys/system/logonui/NT6design.c + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +#include "logonui.h" + +/* DATA *********************************************************************/ + +#define LOGONUI_KEY L"SOFTWARE\\Microsoft\\Windows\CurrentVersion\\Authentication\\LogonUI" + + +/* GLOBALS ******************************************************************/ + +/* FUNCTIONS ****************************************************************/ + + + +/* EOF */ Propchange: trunk/reactos/base/system/logonui/NT6design.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/logonui/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 25 17:13:54 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/logonui/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/logonui/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/logonui/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/logonui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/lang/e… ============================================================================== --- trunk/reactos/base/system/logonui/lang/en-US.rc (added) +++ trunk/reactos/base/system/logonui/lang/en-US.rc [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,3 @@ +#include "resource.h" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + Propchange: trunk/reactos/base/system/logonui/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/logonui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/logonu… ============================================================================== --- trunk/reactos/base/system/logonui/logonui.c (added) +++ trunk/reactos/base/system/logonui/logonui.c [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,171 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Logon User Interface Host + * FILE: subsys/system/logonui/logonui.c + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +#include "logonui.h" + +/* DATA **********************************************************************/ + + + + +/* GLOBALS ******************************************************************/ + +PINFO g_pInfo = NULL; + + +/* FUNCTIONS ****************************************************************/ + + +static HDC +DrawBaseBackground(HDC hdcDesktop) +{ + HDC hdcMem; + + hdcMem = NT5_DrawBaseBackground(hdcDesktop); + + return hdcMem; +} + +static VOID +DrawLogoffScreen(HDC hdcMem) +{ + /* Draw the logoff icon */ + NT5_CreateLogoffScreen(L"Saving your settings...", hdcMem); +} + +static ULONG +GetULONG(LPWSTR String) +{ + UINT i, Length; + ULONG Value; + LPWSTR StopString; + + i = 0; + /* Get the string length */ + Length = (UINT)wcslen(String); + + /* Check the string only consists of numbers */ + while ((i < Length) && ((String[i] < L'0') || (String[i] > L'9'))) i++; + if ((i >= Length) || ((String[i] < L'0') || (String[i] > L'9'))) + { + return (ULONG)-1; + } + + /* Convert it */ + Value = wcstoul(&String[i], &StopString, 10); + + return Value; +} + +static ULONG +GetULONG2(LPWSTR String1, LPWSTR String2, PINT i) +{ + ULONG Value; + + /* Check the first string value */ + Value = GetULONG(String1); + if (Value == (ULONG)-1) + { + /* Check the second string value isn't a switch */ + if (String2[0] != L'-') + { + /* Check the value */ + Value = GetULONG(String2); + *i += 1; + } + } + + return Value; +} + +static BOOL +ParseCmdline(int argc, WCHAR* argv[]) +{ + return TRUE; +} + +static VOID +Run() +{ + HWND hDesktopWnd; + HDC hdcDesktop, hdcMem; + + /* Get the screen size */ + g_pInfo->cx = GetSystemMetrics(SM_CXSCREEN); + g_pInfo->cy = GetSystemMetrics(SM_CYSCREEN); + + hDesktopWnd = GetDesktopWindow(); + + /* Get the DC for the desktop */ + hdcDesktop = GetDCEx(hDesktopWnd, NULL, DCX_CACHE); + if (hdcDesktop) + { + /* Initialize the base background onto a DC */ + hdcMem = DrawBaseBackground(hdcDesktop); + if (hdcMem) + { + /* TEST : Draw logoff screen */ + DrawLogoffScreen(hdcMem); + + /* Blit the off-screen DC to the desktop */ + BitBlt(hdcDesktop, + 0, + 0, + g_pInfo->cx, + g_pInfo->cy, + hdcMem, + 0, + 0, + SRCCOPY); + + /* Delete the memory DC */ + DeleteDC(hdcMem); + } + + /* Release the desktop DC */ + ReleaseDC(hDesktopWnd, hdcDesktop); + } +} + +int WINAPI +wWinMain(IN HINSTANCE hInst, + IN HINSTANCE hPrevInstance, + IN LPWSTR lpszCmdLine, + IN int nCmdShow) +{ + LPWSTR *lpArgs; + INT NumArgs; + + /* Allocate memory for the data */ + g_pInfo = (PINFO)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(INFO)); + if (!g_pInfo) return -1; + + g_pInfo->hInstance = hInst; + + /* Get the command line args */ + lpArgs = CommandLineToArgvW(lpszCmdLine, &NumArgs); + if (lpArgs) + { + /* Parse the command line */ + if (ParseCmdline(NumArgs, lpArgs)) + { + /* Start the main routine */ + Run(); + } + } + + /* Free the data */ + HeapFree(GetProcessHeap(), + 0, + g_pInfo); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/system/logonui/logonui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/logonui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/logonu… ============================================================================== --- trunk/reactos/base/system/logonui/logonui.h (added) +++ trunk/reactos/base/system/logonui/logonui.h [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,20 @@ +#pragma once + +#include <windows.h> +#include "resource.h" + +typedef struct _INFO +{ + HINSTANCE hInstance; + INT cx; + INT cy; + +} INFO, *PINFO; + +extern PINFO g_pInfo; + + + +HDC NT5_DrawBaseBackground(HDC hdcDesktop); +VOID NT5_CreateLogoffScreen(LPWSTR lpText, HDC hdcMem); +VOID NT5_RefreshLogoffScreenText(LPWSTR lpText, HDC hdcMem); Propchange: trunk/reactos/base/system/logonui/logonui.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/logonui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/logonu… ============================================================================== --- trunk/reactos/base/system/logonui/logonui.rbuild (added) +++ trunk/reactos/base/system/logonui/logonui.rbuild [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="logonui" type="win32gui" installbase="system32" installname="LogonUI.exe" unicode="yes"> + <include base="logonui">.</include> + <library>user32</library> + <library>gdi32</library> + <file>logonui.c</file> + <file>NT5design.c</file> + <file>NT6design.c</file> + <file>logonui.rc</file> +</module> Propchange: trunk/reactos/base/system/logonui/logonui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/logonui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/logonu… ============================================================================== --- trunk/reactos/base/system/logonui/logonui.rc (added) +++ trunk/reactos/base/system/logonui/logonui.rc [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,8 @@ +#include <windows.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon User Interface Host\0" +#define REACTOS_STR_INTERNAL_NAME "LogonUI\0" +#define REACTOS_STR_ORIGINAL_FILENAME "LogonUI.exe\0" +//#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/base/system/logonui/logonui.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/logonui/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 25 17:13:54 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/logonui/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/logonui/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/logonui/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/logonui/res/100.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/10… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/100.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/res/123.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/12… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/123.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/res/125.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/12… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/125.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/res/126.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/12… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/126.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/res/unknown.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/un… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/unknown.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/res/unknown2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/res/un… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/logonui/res/unknown2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/system/logonui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/resour… ============================================================================== --- trunk/reactos/base/system/logonui/resource.h (added) +++ trunk/reactos/base/system/logonui/resource.h [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,5 @@ + +#define IDB_MAIN_PANEL_SHINE 100 +#define IDB_MAIN_ROS_LOGO 123 +#define IDB_TOP_DIVIDER_STRIP 125 +#define IDB_BOTTOM_DIVIDER_STRIP 126 Propchange: trunk/reactos/base/system/logonui/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/logonui/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/logonui/rsrc.r… ============================================================================== --- trunk/reactos/base/system/logonui/rsrc.rc (added) +++ trunk/reactos/base/system/logonui/rsrc.rc [iso-8859-1] Wed May 25 17:13:54 2011 @@ -1,0 +1,14 @@ + +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL + +IDB_MAIN_PANEL_SHINE BITMAP DISCARDABLE "res/100.bmp" +IDB_MAIN_ROS_LOGO BITMAP DISCARDABLE "res/123.bmp" +IDB_TOP_DIVIDER_STRIP BITMAP DISCARDABLE "res/125.bmp" +IDB_BOTTOM_DIVIDER_STRIP BITMAP DISCARDABLE "res/126.bmp" + + +//#include "lang/en-US.rc" + Propchange: trunk/reactos/base/system/logonui/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 7 months

[agreen] 51905: [Explorer_new] - Remove CaptionDrawTemp - Added flashing task - Added theming to toolbar buttons

by agreen＠svn.reactos.org

Author: agreen Date: Wed May 25 17:08:53 2011 New Revision: 51905 URL: http://svn.reactos.org/svn/reactos?rev=51905&view=rev Log: [Explorer_new] - Remove CaptionDrawTemp - Added flashing task - Added theming to toolbar buttons Added: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.exe.manifest (with props) Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/CMakeLists.txt branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.rc branches/GSoC_2011/NewExplorer/base/shell/explorer-new/precomp.h branches/GSoC_2011/NewExplorer/base/shell/explorer-new/taskswnd.c Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Wed May 25 17:08:53 2011 @@ -34,6 +34,7 @@ shell32 shlwapi version + uxtheme msvcrt kernel32 ntdll) Added: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.exe.manifest URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.exe.manifest (added) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.exe.manifest [iso-8859-1] Wed May 25 17:08:53 2011 @@ -1,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.Explorer" + type="win32" +/> +<description>This is ReactOS Explorer</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Propchange: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.exe.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/explorer.rc [iso-8859-1] Wed May 25 17:08:53 2011 @@ -20,6 +20,7 @@ IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL BITMAP DISCARDABLE res/nolock_nogroup_noql.bmp IDB_TASKBARPROP_NOLOCK_NOGROUP_QL BITMAP DISCARDABLE res/nolock_nogroup_ql.bmp IDB_TASKBARPROP_NOLOCK_GROUP_QL BITMAP DISCARDABLE res/nolock_group_ql.bmp +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/precomp.h [iso-8859-1] Wed May 25 17:08:53 2011 @@ -17,7 +17,9 @@ #include <tchar.h> #include <stdio.h> #include <stdlib.h> - +#include <uxtheme.h> + +#include "tmschema.h" #include "resource.h" #include "comcsup.h" #include "todo.h" Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed May 25 17:08:53 2011 @@ -20,10 +20,6 @@ #include <precomp.h> -/* By default we don't use DrawCaptionTemp() because it causes some minimal - drawing glitches with the toolbar custom painting code */ -#define TASK_USE_DRAWCAPTIONTEMP 1 - /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ #define DUMP_TASKS 0 @@ -47,14 +43,6 @@ struct { -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* DisplayTooltip is TRUE when the group button text didn't fit into - the button. */ - DWORD DisplayTooltip : 1; - -#endif - DWORD IsCollapsed : 1; }; }; @@ -65,26 +53,15 @@ HWND hWnd; PTASK_GROUP Group; INT Index; - -#if !(TASK_USE_DRAWCAPTIONTEMP != 0) - INT IconIndex; -#endif + union { DWORD dwFlags; struct { - -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* DisplayTooltip is TRUE when the window text didn't fit into the - button. */ - DWORD DisplayTooltip : 1; - -#endif /* IsFlashing is TRUE when the task bar item should be flashing. */ DWORD IsFlashing : 1; @@ -113,9 +90,11 @@ PTASK_ITEM TaskItems; PTASK_ITEM ActiveTaskItem; + HTHEME TaskBandTheme; HWND hWndToolbar; UINT TbButtonsPerLine; WORD ToolbarBtnCount; + HIMAGELIST TaskIcons; union { @@ -139,12 +118,6 @@ static VOID TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This, IN BOOL bRedrawDisabled); -#if TASK_USE_DRAWCAPTIONTEMP != 0 - -#define TaskSwitchWnd_GetWndTextFromTaskItem(a,b) NULL - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - static LPTSTR TaskSwitchWnd_GetWndTextFromTaskItem(IN OUT PTASK_SWITCH_WND This, IN PTASK_ITEM TaskItem) @@ -161,7 +134,6 @@ return NULL; } -#endif #if DUMP_TASKS != 0 static VOID @@ -408,19 +380,44 @@ /* FIXME: Implement */ } +static HICON +TaskSwitchWnd_GetWndIcon(HWND hwnd) +{ + HICON hIcon = 0; + + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); + + return hIcon; +} static INT TaskSwitchWnd_UpdateTaskItemButton(IN OUT PTASK_SWITCH_WND This, IN PTASK_ITEM TaskItem) { TBBUTTONINFO tbbi; - + HICON icon; + ASSERT(TaskItem->Index >= 0); tbbi.cbSize = sizeof(tbbi); - tbbi.dwMask = TBIF_BYINDEX | TBIF_STATE | TBIF_TEXT; + tbbi.dwMask = TBIF_BYINDEX | TBIF_STATE | TBIF_TEXT | TBIF_IMAGE; tbbi.fsState = TBSTATE_ENABLED; if (This->ActiveTaskItem == TaskItem) tbbi.fsState |= TBSTATE_CHECKED; + + if (TaskItem->RenderFlashed) + tbbi.fsState |= TBSTATE_MARKED; /* Check if we're updating a button that is the last one in the line. If so, we need to set the TBSTATE_WRAP flag! */ @@ -433,6 +430,10 @@ tbbi.pszText = TaskSwitchWnd_GetWndTextFromTaskItem(This, TaskItem); + icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); + TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons,TaskItem->IconIndex,icon); + tbbi.iImage = TaskItem->IconIndex; + if (!SendMessage(This->hWndToolbar, TB_SETBUTTONINFO, (WPARAM)TaskItem->Index, @@ -445,6 +446,40 @@ DbgPrint("Updated button %d for hwnd 0x%p\n", TaskItem->Index, TaskItem->hWnd); return TaskItem->Index; } + +static void +TaskSwitchWnd_RemoveIcon(IN OUT PTASK_SWITCH_WND This, + IN PTASK_ITEM TaskItem) +{ + TBBUTTONINFO tbbi; + PTASK_ITEM currentTaskItem,LastItem; + + if(TaskItem->IconIndex==-1) + return; + + tbbi.cbSize = sizeof(tbbi); + tbbi.dwMask = TBIF_IMAGE; + + currentTaskItem = This->TaskItems; + LastItem = currentTaskItem + This->TaskItemCount; + while (currentTaskItem != LastItem) + { + if (currentTaskItem->IconIndex > TaskItem->IconIndex) + { + currentTaskItem->IconIndex--; + tbbi.iImage = currentTaskItem->IconIndex; + + SendMessage(This->hWndToolbar, + TB_SETBUTTONINFO, + (WPARAM)currentTaskItem->Index, + (LPARAM)&tbbi); + } + currentTaskItem++; + } + + ImageList_Remove(This->TaskIcons, TaskItem->IconIndex); +} + static PTASK_ITEM TaskSwitchWnd_FindLastTaskItemOfGroup(IN OUT PTASK_SWITCH_WND This, @@ -541,6 +576,7 @@ { TBBUTTON tbBtn; INT iIndex; + HICON icon; if (TaskItem->Index >= 0) { @@ -556,7 +592,10 @@ TaskItem->Group); } - tbBtn.iBitmap = 0; + icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); + TaskItem->IconIndex = ImageList_AddIcon(This->TaskIcons, icon); + + tbBtn.iBitmap = TaskItem->IconIndex; tbBtn.fsState = TBSTATE_ENABLED | TBSTATE_ELLIPSES; tbBtn.fsStyle = BTNS_CHECK | BTNS_NOPREFIX | BTNS_SHOWTEXT; tbBtn.dwData = TaskItem->Index; @@ -612,6 +651,7 @@ { TaskSwitchWnd_BeginUpdate(This); + TaskSwitchWnd_RemoveIcon(This,TaskItem); iIndex = TaskItem->Index; if (SendMessage(This->hWndToolbar, TB_DELETEBUTTON, @@ -1107,7 +1147,10 @@ TaskSwitchWnd_FlashTaskItem(IN OUT PTASK_SWITCH_WND This, IN OUT PTASK_ITEM TaskItem) { - /* FIXME: Implement */ + TaskItem->RenderFlashed=1; + TaskSwitchWnd_UpdateTaskItemButton(This, + TaskItem); + } static BOOL @@ -1151,6 +1194,7 @@ else if (TaskItem->Index >= 0) { UpdateTaskItem: + TaskItem->RenderFlashed=0; TaskSwitchWnd_UpdateTaskItemButton(This, TaskItem); } @@ -1384,6 +1428,18 @@ } return Ret; +} + +static VOID +TaskSwitchWnd_UpdateTheme(IN OUT PTASK_SWITCH_WND This) +{ + if(This->TaskBandTheme) + CloseThemeData(This->TaskBandTheme); + + if(IsThemeActive()) + This->TaskBandTheme = OpenThemeData(This->hWnd, L"TaskBand"); + else + This->TaskBandTheme = 0; } static VOID @@ -1410,11 +1466,16 @@ HMODULE hShell32; SIZE BtnSize; + SetWindowTheme(This->hWndToolbar, L"TaskBand", NULL); + TaskSwitchWnd_UpdateTheme(This); /* Identify the version we're using */ SendMessage(This->hWndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + This->TaskIcons = ImageList_Create(16, 16, ILC_COLOR32, 0, 1000); + SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->TaskIcons); /* Calculate the default button size. Don't save this in This->ButtonSize.cx so that the actual button width gets updated correctly on the first recalculation */ @@ -1497,6 +1558,7 @@ } } + CloseThemeData(This->TaskBandTheme); TaskSwitchWnd_DeleteAllTasks(This); } @@ -1729,7 +1791,7 @@ GetCursorPos(&pt); cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); if (cmd) { - SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed + SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); } } @@ -1778,16 +1840,10 @@ TaskSwichWnd_HandleItemPaint(IN OUT PTASK_SWITCH_WND This, IN OUT NMTBCUSTOMDRAW *nmtbcd) { - HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; PTASK_GROUP TaskGroup; PTASK_ITEM TaskItem; -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - UINT uidctFlags = DC_TEXT | DC_ICON | DC_NOSENDMSG; - -#endif TaskItem = FindTaskItemByIndex(This, (INT)nmtbcd->nmcd.dwItemSpec); TaskGroup = FindTaskGroupByIndex(This, @@ -1798,97 +1854,29 @@ if (TaskItem != NULL && IsWindow(TaskItem->hWnd)) { - hCaptionFont = ITrayWindow_GetCaptionFonts(This->Tray, - &hBoldCaptionFont); - if (nmtbcd->nmcd.uItemState & CDIS_CHECKED) - hCaptionFont = hBoldCaptionFont; - -#if TASK_USE_DRAWCAPTIONTEMP != 0 - - /* Make sure we don't draw on the button edges */ - InflateRect(&nmtbcd->nmcd.rc, - -GetSystemMetrics(SM_CXEDGE), - -GetSystemMetrics(SM_CYEDGE)); - - if ((nmtbcd->nmcd.uItemState & CDIS_MARKED) && TaskItem->RenderFlashed) - { - /* This is a slight glitch. We have to move the rectangle so that - the button content appears to be pressed. However, when flashing - is enabled, we can see a light line at the top and left inner - border. We need to fill that area with the flashing color. Note - that since we're using DrawCaptionTemp() the flashing color is - COLOR_ACTIVECAPTION, not COLOR_HIGHLIGHT! */ - FillRect(nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - (HBRUSH)(COLOR_ACTIVECAPTION + 1)); - - /* Make the button content appear pressed. This however draws a bit - into the right and bottom border of the button edge, making it - look a bit odd. However, selecting a clipping region to prevent - that from happening causes problems with DrawCaptionTemp()! */ - OffsetRect(&nmtbcd->nmcd.rc, - 1, - 1); - - /* Render flashed */ - uidctFlags |= DC_ACTIVE; - } - else - { - uidctFlags |= DC_INBUTTON; - if (nmtbcd->nmcd.uItemState & CDIS_CHECKED) - uidctFlags |= DC_ACTIVE; - } - - if (DrawCapTemp != NULL) - { - /* Draw the button content */ - TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, - nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - hCaptionFont, - NULL, - NULL, - uidctFlags); - } - - return CDRF_SKIPDEFAULT; - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - /* Make the entire button flashing if neccessary */ if (nmtbcd->nmcd.uItemState & CDIS_MARKED) { - if (TaskItem->RenderFlashed) - { - nmtbcd->hbrMonoDither = GetSysColorBrush(COLOR_HIGHLIGHT); - nmtbcd->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); - nmtbcd->nHLStringBkMode = TRANSPARENT; - - /* We don't really need to set clrMark because we set the - background mode to TRANSPARENT! */ - nmtbcd->clrMark = GetSysColor(COLOR_HIGHLIGHT); - - Ret |= TBCDRF_USECDCOLORS; + Ret=TBCDRF_NOBACKGROUND; + if(!This->TaskBandTheme){ + SelectObject(nmtbcd->nmcd.hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); + Rectangle(nmtbcd->nmcd.hdc, + nmtbcd->nmcd.rc.left, + nmtbcd->nmcd.rc.top, + nmtbcd->nmcd.rc.right, + nmtbcd->nmcd.rc.bottom); + }else{ + DrawThemeBackground(This->TaskBandTheme, nmtbcd->nmcd.hdc, TDP_FLASHBUTTON, 0, &nmtbcd->nmcd.rc, 0); } - else - Ret |= TBCDRF_NOMARK; - } - - /* Select the font we want to use */ - SelectObject(nmtbcd->nmcd.hdc, - hCaptionFont); - return Ret | CDRF_NEWFONT; - -#endif - + nmtbcd->clrText = GetSysColor(COLOR_HIGHLIGHTTEXT); + return Ret; + } } } else if (TaskGroup != NULL) { /* FIXME: Implement painting for task groups */ } - return Ret; } @@ -1907,22 +1895,7 @@ switch (nmtbcd->nmcd.dwDrawStage) { -#if TASK_USE_DRAWCAPTIONTEMP != 0 - case CDDS_ITEMPREPAINT: - /* We handle drawing in the post-paint stage so that we - don't have to draw the button edges, etc */ - Ret = CDRF_NOTIFYPOSTPAINT; - break; - - case CDDS_ITEMPOSTPAINT: - -#else /* !TASK_USE_DRAWCAPTIONTEMP */ - - case CDDS_ITEMPREPAINT: - -#endif - Ret = TaskSwichWnd_HandleItemPaint(This, nmtbcd); break; @@ -1940,6 +1913,13 @@ } return Ret; +} + +static void TaskSwitchWnd_DrawBackground(HWND wnd, HDC dc) +{ + RECT rect; + GetClientRect(wnd, &rect); + DrawThemeParentBackground(wnd, dc, &rect); } static LRESULT CALLBACK @@ -1961,6 +1941,12 @@ { switch (uMsg) { + case WM_THEMECHANGED: + TaskSwitchWnd_UpdateTheme(This); + break; + case WM_ERASEBKGND: + TaskSwitchWnd_DrawBackground(hwnd,(HDC)wParam); + break; case WM_SIZE: { SIZE szClient;

13 years, 7 months

[tkreuzer] 51904: [CMAKE] Enable rule messages! Forever!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 25 14:53:56 2011 New Revision: 51904 URL: http://svn.reactos.org/svn/reactos?rev=51904&view=rev Log: [CMAKE] Enable rule messages! Forever! Modified: branches/GSoC_2011/GdiFontDriver/CMakeLists.txt Modified: branches/GSoC_2011/GdiFontDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/CMakeLi… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/CMakeLists.txt [iso-8859-1] Wed May 25 14:53:56 2011 @@ -20,7 +20,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) -set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) +set_property(GLOBAL PROPERTY RULE_MESSAGES ON) if(NOT ARCH) set(ARCH i386)

13 years, 7 months

[sserapion] 51903: Add some missing MSV1_0_AVID definitions(vista+)

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed May 25 14:53:19 2011 New Revision: 51903 URL: http://svn.reactos.org/svn/reactos?rev=51903&view=rev Log: Add some missing MSV1_0_AVID definitions(vista+) Modified: branches/sspi-bringup/reactos/include/psdk/ntsecapi.h Modified: branches/sspi-bringup/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… ============================================================================== --- branches/sspi-bringup/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/include/psdk/ntsecapi.h [iso-8859-1] Wed May 25 14:53:19 2011 @@ -771,7 +771,9 @@ #define MSV1_0_NTLM3_MIN_NT_RESPONSE_LENGTH RTL_SIZEOF_THROUGH_FIELD(MSV1_0_NTLM3_RESPONSE,AvPairsOff) typedef enum { - MsvAvEOL,MsvAvNbComputerName,MsvAvNbDomainName,MsvAvDnsComputerName,MsvAvDnsDomainName,MsvAvDnsTreeName,MsvAvFlags + MsvAvEOL,MsvAvNbComputerName,MsvAvNbDomainName,MsvAvDnsComputerName, + MsvAvDnsDomainName, MsvAvDnsTreeName, MsvAvFlags, MsvAvTimestamp, + MsvAvRestrictions, MsvAvTargetName, MsvAvChannelBindings } MSV1_0_AVID; typedef struct _MSV1_0_AV_PAIR {

13 years, 7 months

[mkupfer] 51902: use application specific icon for small AND large icon instead of predefined one (otherwise alt-tab shows default icon)

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed May 25 11:22:36 2011 New Revision: 51902 URL: http://svn.reactos.org/svn/reactos?rev=51902&view=rev Log: use application specific icon for small AND large icon instead of predefined one (otherwise alt-tab shows default icon) Modified: trunk/reactos/base/applications/mspaint/main.c Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Wed May 25 11:22:36 2011 @@ -168,8 +168,8 @@ wincl.lpfnWndProc = WindowProcedure; wincl.style = CS_DBLCLKS; wincl.cbSize = sizeof(WNDCLASSEX); - wincl.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wincl.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(500)); + wincl.hIcon = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); + wincl.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); wincl.hCursor = LoadCursor(NULL, IDC_ARROW); wincl.lpszMenuName = NULL; wincl.cbClsExtra = 0;

13 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011