Index: base/shell/explorer-new/command_line.c =================================================================== --- base/shell/explorer-new/command_line.c (revision 0) +++ base/shell/explorer-new/command_line.c (revision 0) @@ -0,0 +1,236 @@ +#include + +HRESULT WINAPI SHOpenFolderAndSelectItems( + IN PCIDLIST_ABSOLUTE pidlFolder, + UINT cidl, + IN OPTIONAL PCUITEMID_CHILD_ARRAY *apidl, + DWORD dwFlags +); + +/* return values */ +#define NOT_ENOUGH_MEMORY 1 +#define IO_ERROR 2 + +/* common check of memory allocation results */ +#define CHECK_ENOUGH_MEMORY(p) \ +if (!(p)) \ +{ \ + exit(NOT_ENOUGH_MEMORY); \ +} + +TCHAR szProfilePath[MAX_PATH]; + +typedef enum +{ + ACTION_SELECT, ACTION_ROOT, ACTION_EXPLVIEW, ACTION_NEWWINDOW, ACTION_DEFAULT +} EXPLORER_ACTION; + +/****************************************************************************** + * Copies file name from command line string to the buffer. + * Rewinds the command line string pointer to the next non-space character + * after the file name. + * Buffer contains an empty string if no filename was found; + * + * params: + * command_line - command line current position pointer + * where *s[0] is the first symbol of the file name. + * file_name - buffer to write the file name to. + */ +void get_file_name(LPWSTR *command_line, LPWSTR file_name) +{ + WCHAR *s = *command_line; + int pos = 0; /* position of pointer "s" in *command_line */ + file_name[0] = 0; + + if (!s[0]) + { + return; + } + + if (s[0] == L'"') + { + s++; + (*command_line)++; + while(s[0] != L'"') + { + if (!s[0]) + { + //action = ACTION_DEFAULT; //Unexpected end of file name + } + s++; + pos++; + } + } + else + { + while(s[0] && !iswspace(s[0])) + { + s++; + pos++; + } + } + memcpy(file_name, *command_line, pos * sizeof((*command_line)[0])); + /* remove the last backslash */ + if (file_name[pos - 1] == L'\\') + { + file_name[pos - 1] = L'\0'; + } + else + { + file_name[pos] = L'\0'; + } + + if (s[0]) + { + s++; + pos++; + } + while(s[0] && iswspace(s[0])) + { + s++; + pos++; + } + (*command_line) += pos; +} + + +BOOL PerformExplAction(EXPLORER_ACTION action, LPWSTR s) +{ + wchar_t fpath[MAX_PATH]; + get_file_name(&s, fpath); + + switch (action) + { + case ACTION_SELECT: + { + if (!fpath[0]) + { + action = ACTION_DEFAULT; //No file name is specified + } + else + { + PIDLIST_ABSOLUTE pidlFolder; + + pidlFolder = ILCreateFromPath(fpath); + if (pidlFolder) + { + SHOpenFolderAndSelectItems(pidlFolder, 0, NULL, 0); + ILFree(pidlFolder); + } + } + break; + } + case ACTION_EXPLVIEW: + //FIXME /e + break; + + case ACTION_NEWWINDOW: + { + //FIXME: Open folder '/n,' + } + break; + + case ACTION_ROOT: + //FIXME /root, + break; + + case ACTION_DEFAULT: + { + if(SUCCEEDED(SHGetFolderPath(NULL, + CSIDL_PROFILE|CSIDL_FLAG_CREATE, + NULL, + 0, + szProfilePath))) + { + TCHAR str[255]; + _stprintf(str, _T("Open: %s"), szProfilePath); + MessageBox(0, str, 0, MB_OK); + // ShellExecute(NULL, NULL, szProfilePath, NULL, NULL, SW_SHOWNORMAL); //Enable ShellExecute and explorer will go to infinitive loop + } + } + break; + + default: + action = ACTION_DEFAULT; + break; + } + return TRUE; +} + +BOOL ProcessCmdLine(LPWSTR lpCmdLine) +{ + EXPLORER_ACTION action = ACTION_DEFAULT; + LPWSTR s = lpCmdLine; /* command line pointer */ + WCHAR ch = *s; /* current character */ + + while (ch && (ch == L'/')) + { + WCHAR chu; + WCHAR ch2; + + s++; + ch = *s; + ch2 = *(s + 1); + chu = (WCHAR)towupper(ch); + if (!ch2 || iswspace(ch2)) + { + { + switch (chu) + { + case L'E': + { + action = ACTION_EXPLVIEW; + } + break; + + default: + { + action = ACTION_DEFAULT; + } + break; + } + } + s++; + } + else + { + if (ch2 == L',') + { + switch (chu) + { + case L'N': //option '/n,' + + s += 2; + action = ACTION_NEWWINDOW; + break; + default: + { + action = ACTION_DEFAULT; + } + break; + } + } + else + { + if (!_wcsnicmp(s, L"SELECT,", 7)) //there we deal with multi-letter options + { + s += 7; + action = ACTION_SELECT; + } + else + s--; // this is a file name, starting from '/' + break; + } + } + + /* skip spaces to the next parameter */ + ch = *s; + while (ch && iswspace(ch)) + { + s++; + ch = *s; + } + } + + return PerformExplAction(action, s); +} Index: base/shell/explorer-new/explorer.c =================================================================== --- base/shell/explorer-new/explorer.c (revision 51611) +++ base/shell/explorer-new/explorer.c (working copy) @@ -32,9 +32,6 @@ WORD wCodePage; } LANGCODEPAGE, *PLANGCODEPAGE; -/* undoc GUID */ -DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); - LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, @@ -350,6 +347,19 @@ return bRet; } +static void HideMinimizedWindows(BOOL hide) +{ + MINIMIZEDMETRICS mm; + mm.cbSize = sizeof(MINIMIZEDMETRICS); + SystemParametersInfo(SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &mm, FALSE); + if(hide) + mm.iArrange |= ARW_HIDE; + else + mm.iArrange &= ~ARW_HIDE; + SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &mm, FALSE); +} + + INT WINAPI _tWinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, @@ -393,7 +403,9 @@ if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) { Tray = CreateTrayWindow(); - + + HideMinimizedWindows(TRUE); + if (Tray != NULL) hShellDesktop = DesktopCreateWindow(Tray); } @@ -404,10 +416,11 @@ } else { - /* A shell is already loaded. Parse the command line arguments - and unless we need to do something specific simply display - the desktop in a separate explorer window */ - /* FIXME */ + /* A shell is already loaded. Parse the command line arguments */ + if (ProcessCmdLine(lpCmdLine)) + { + return 0; + } } if (Tray != NULL) Index: base/shell/explorer-new/explorer.rbuild =================================================================== --- base/shell/explorer-new/explorer.rbuild (revision 51611) +++ base/shell/explorer-new/explorer.rbuild (working copy) @@ -24,5 +24,6 @@ trayntfy.c trayprop.c traywnd.c + command_line.c explorer.rc Index: base/shell/explorer-new/lang/bg-BG.rc =================================================================== --- base/shell/explorer-new/lang/bg-BG.rc (revision 51611) +++ base/shell/explorer-new/lang/bg-BG.rc (working copy) @@ -62,7 +62,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX " &", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -70,6 +70,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX " & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "& ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/cs-CZ.rc =================================================================== --- base/shell/explorer-new/lang/cs-CZ.rc (revision 51611) +++ base/shell/explorer-new/lang/cs-CZ.rc (working copy) @@ -65,7 +65,7 @@ CAPTION "Hlavn panel" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhled hlavnho panelu", IDC_STATIC, 6,6,240,121 + GROUPBOX "Vzhled hlavnho panelu", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Uzamknout &hlavn panel", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Automaticky sktvat hlavn panel", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -73,6 +73,7 @@ AUTOCHECKBOX "&Seskupovat podobn tlatka hlavnho panelu", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Zobrazit &panel Snadn sputn", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Zobrazit &nhledy oken", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/de-DE.rc =================================================================== --- base/shell/explorer-new/lang/de-DE.rc (revision 51611) +++ base/shell/explorer-new/lang/de-DE.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskleiste" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskleiste", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskleiste", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Task&leiste fixieren", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Taskleiste a&utom. verstecken", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "hnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Fenstervor&schau anzeigen", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/en-US.rc =================================================================== --- base/shell/explorer-new/lang/en-US.rc (revision 51611) +++ base/shell/explorer-new/lang/en-US.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -127,3 +128,22 @@ BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu Properties" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGESYNTAX "Syntax:\n" + /* "EXPLORER.EXE [/n][/e][,/root,][[,/select],]\n" + "Usage:\n" + "/n: Opens a new window in single-paned (My Computer) view for each item\n" + "selected, even if the new window duplicates a window that is\n" + "already open.\n" + "/e: Uses ReactOS Explorer view. ReactOS Explorer view is most similar\n" + "to File Manager in Windows version 3.x. Note that the default view\n" + "is Open view.\n" + "/root,: Specifies the root level of the specified view. The\n" + "default is to use the normal namespace root (the desktop).\n" + "Whatever is specified is the root for the display.\n" + "/select,: Specifies the folder to receive the initial\n" + "focus. If '/select' is used, the parent folder\n" + "is opened and the specified object is selected.\n"; */ +END Index: base/shell/explorer-new/lang/es-ES.rc =================================================================== --- base/shell/explorer-new/lang/es-ES.rc (revision 51611) +++ base/shell/explorer-new/lang/es-ES.rc (working copy) @@ -68,7 +68,7 @@ CAPTION "Barra de tareas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Apariencia de la Barra de tareas ", IDC_STATIC, 6,6,240,121 + GROUPBOX "Apariencia de la Barra de tareas ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Ocultar automticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -76,6 +76,7 @@ AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Mostrar Inicio rpi&do", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "M&ostrar vista previa de las ventanas (miniaturas)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/fr-FR.rc =================================================================== --- base/shell/explorer-new/lang/fr-FR.rc (revision 51611) +++ base/shell/explorer-new/lang/fr-FR.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/it-IT.rc =================================================================== --- base/shell/explorer-new/lang/it-IT.rc (revision 51611) +++ base/shell/explorer-new/lang/it-IT.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Barra delle applicazioni" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6,6,240,121 + GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Bloccare la Barra delle applicazioni", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "N&ascondere automaticamente", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Mostrare anteprima delle finestre (miniature)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ja-JP.rc =================================================================== --- base/shell/explorer-new/lang/ja-JP.rc (revision 51611) +++ base/shell/explorer-new/lang/ja-JP.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "^XNo[" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN - GROUPBOX "^XNo[̊O", IDC_STATIC, 6,6,240,121 + GROUPBOX "^XNo[̊O", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "^XNo[Œ肷(&L)", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "^XNo[IɉB(&U)", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "ގ^XNo[{^O[v(&G)", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "NCbNN̕\(&Q)", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "EChẼvr[\(TlC)(&S)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ko-KR.rc =================================================================== --- base/shell/explorer-new/lang/ko-KR.rc (revision 51611) +++ base/shell/explorer-new/lang/ko-KR.rc (working copy) @@ -64,7 +64,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -72,6 +72,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/lt-LT.rc =================================================================== --- base/shell/explorer-new/lang/lt-LT.rc (revision 51611) +++ base/shell/explorer-new/lang/lt-LT.rc (working copy) @@ -63,7 +63,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -71,6 +71,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Rodyti sekundes", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/nl-NL.rc =================================================================== --- base/shell/explorer-new/lang/nl-NL.rc (revision 51611) +++ base/shell/explorer-new/lang/nl-NL.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taakbalk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taakbalkweergave", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taakbalkweergave", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Taakbalk &vergrendelen", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Taakbalk a&utomatisch verbergen", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Venstervoorbeelden (miniatuurweergaven) &weergeven", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/no-NO.rc =================================================================== --- base/shell/explorer-new/lang/no-NO.rc (revision 51611) +++ base/shell/explorer-new/lang/no-NO.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Oppgavelinje" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6,6,240,121 + GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Ls oppgavelinjen", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "&Skjul oppgavelinjen automatisk", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Grupper og lignende knapper p oppgavelinjen", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Vis vinduforhndvisning (miniaturbilde)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/pl-PL.rc =================================================================== --- base/shell/explorer-new/lang/pl-PL.rc (revision 51611) +++ base/shell/explorer-new/lang/pl-PL.rc (working copy) @@ -62,7 +62,7 @@ CAPTION "Pasek zada" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Wygld paska zada", IDC_STATIC, 6,6,240,121 + GROUPBOX "Wygld paska zada", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Zablokuj pasek zada", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&utomatyczne ukrywanie paska zada", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -70,6 +70,7 @@ AUTOCHECKBOX "&Grupuj programy w pasku zada", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Poka pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Poka podgld okien (miniaturki)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ro-RO.rc =================================================================== --- base/shell/explorer-new/lang/ro-RO.rc (revision 51611) +++ base/shell/explorer-new/lang/ro-RO.rc (working copy) @@ -59,7 +59,7 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,121 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -67,6 +67,7 @@ AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/ru-RU.rc =================================================================== --- base/shell/explorer-new/lang/ru-RU.rc (revision 51611) +++ base/shell/explorer-new/lang/ru-RU.rc (working copy) @@ -61,7 +61,7 @@ CAPTION " " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "& ", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -69,6 +69,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX " & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "& ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/sk-SK.rc =================================================================== --- base/shell/explorer-new/lang/sk-SK.rc (revision 51611) +++ base/shell/explorer-new/lang/sk-SK.rc (working copy) @@ -64,7 +64,7 @@ CAPTION "Panel loh" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhad panela loh", IDC_STATIC, 6,6,240,121 + GROUPBOX "Vzhad panela loh", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "Za&mkn panel loh", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "A&utomaticky skva panel loh", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -72,6 +72,7 @@ AUTOCHECKBOX "&Zoskupova podobn tlaidl na paneli s nstrojmi", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Zobrazi panel &Rchle spustenie", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "Z&obrazi nhady okien (miniatry)", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/lang/uk-UA.rc =================================================================== --- base/shell/explorer-new/lang/uk-UA.rc (revision 51611) +++ base/shell/explorer-new/lang/uk-UA.rc (working copy) @@ -67,7 +67,7 @@ CAPTION " " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX " ", IDC_STATIC, 6,6,240,121 + GROUPBOX " ", IDC_STATIC, 6,6,240,134 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 AUTOCHECKBOX "& ", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "& ", IDC_TASKBARPROP_HIDE, 13,58,200,10 @@ -75,6 +75,7 @@ AUTOCHECKBOX "& ", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "³ & ", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 AUTOCHECKBOX "&³ ()", IDC_TASKBARPROP_WNDPREV, 13,110,200,10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 13,123,200,10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 Index: base/shell/explorer-new/precomp.h =================================================================== --- base/shell/explorer-new/precomp.h (revision 51611) +++ base/shell/explorer-new/precomp.h (working copy) @@ -385,6 +385,10 @@ IN BOOL bHideClock); /* + * command_lince.c + */ +BOOL ProcessCmdLine(LPWSTR lpCmdLine); +/* * taskswnd.c */ Index: base/shell/explorer-new/resource.h =================================================================== --- base/shell/explorer-new/resource.h (revision 51611) +++ base/shell/explorer-new/resource.h (working copy) @@ -63,6 +63,7 @@ #define IDC_TASKBARPROP_GROUP 2005 #define IDC_TASKBARPROP_SHOWQL 2006 #define IDC_TASKBARPROP_WNDPREV 2007 +#define IDC_TASKBARPROP_SECONDS 2008 #define IDB_TASKBARPROP_AUTOHIDE 2050 #define IDB_TASKBARPROP_LOCK_GROUP_NOQL 2051 @@ -92,6 +93,7 @@ #define IDC_TASKBARPROP_VOLUME 2205 #define IDC_TASKBARPROP_NETWORK 2206 #define IDC_TASKBARPROP_POWER 2207 +#define IDS_USAGESYNTAX 2208 /* Taskbar properties, toolbars */ #define IDD_TASKBARPROP_TOOLBARS 2300 Index: base/shell/explorer-new/trayntfy.c =================================================================== --- base/shell/explorer-new/trayntfy.c (revision 51611) +++ base/shell/explorer-new/trayntfy.c (working copy) @@ -257,7 +257,15 @@ if (ClockWndFormats[i].IsTime) { + if (blShowSeconds == FALSE) iRet = GetTimeFormat(LOCALE_USER_DEFAULT, + TIME_NOSECONDS, + &This->LocalTime, + ClockWndFormats[i].lpFormat, + This->szLines[i], + BufSize); + else + iRet = GetTimeFormat(LOCALE_USER_DEFAULT, ClockWndFormats[i].dwFormatFlags, &This->LocalTime, ClockWndFormats[i].lpFormat, @@ -276,11 +284,6 @@ if (iRet != 0 && i == 0) { - if (blShowSeconds == FALSE) - { - (This->szLines[0][5] = '\0'); - }; - /* Set the window text to the time only */ SetWindowText(This->hWnd, This->szLines[i]);