From b14ae65161e1464e7d7f882c2bc181ab41727a20 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Thu, 1 May 2008 14:52:11 +0000 Subject: [PATCH] - Change the ... gcc specific statement - Seperators with MENUEX now need the full definition (although the docs don't say this yet) - explorer_new now builds with msvc9. Doesn't link yet though... svn path=/trunk/; revision=33213 --- reactos/base/shell/explorer-new/lang/bg-BG.rc | 4 +- reactos/base/shell/explorer-new/lang/de-DE.rc | 4 +- reactos/base/shell/explorer-new/lang/en-US.rc | 4 +- reactos/base/shell/explorer-new/lang/es-ES.rc | 4 +- reactos/base/shell/explorer-new/lang/fr-FR.rc | 4 +- reactos/base/shell/explorer-new/lang/it-IT.rc | 4 +- reactos/base/shell/explorer-new/lang/pl-PL.rc | 4 +- reactos/base/shell/explorer-new/lang/ru-RU.rc | 4 +- reactos/base/shell/explorer-new/lang/sk-SK.rc | 4 +- reactos/base/shell/explorer-new/lang/uk-UA.rc | 4 +- reactos/base/shell/explorer-new/startmnu.c | 63 ++++++++++--------- 11 files changed, 53 insertions(+), 50 deletions(-) diff --git a/reactos/base/shell/explorer-new/lang/bg-BG.rc b/reactos/base/shell/explorer-new/lang/bg-BG.rc index fedf5a9bef8..fea9db665bc 100644 --- a/reactos/base/shell/explorer-new/lang/bg-BG.rc +++ b/reactos/base/shell/explorer-new/lang/bg-BG.rc @@ -29,7 +29,7 @@ BEGIN POPUP "На&стройки", IDM_SETTINGS BEGIN MENUITEM "&Крило за управление", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Сигурност...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Мрежови връзки", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Печатачи и факсове", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "&Търсене", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Помощ и поддръжка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Изпълнение...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/de-DE.rc b/reactos/base/shell/explorer-new/lang/de-DE.rc index ee417df6a5c..4e3d4aa223b 100644 --- a/reactos/base/shell/explorer-new/lang/de-DE.rc +++ b/reactos/base/shell/explorer-new/lang/de-DE.rc @@ -29,7 +29,7 @@ BEGIN POPUP "&Einstellungen", IDM_SETTINGS BEGIN MENUITEM "S&ystemsteuerung", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicherheit...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Netzwerkverbindungen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drucker und Faxgerдte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "&Suche", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "A&usfьhren...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/en-US.rc b/reactos/base/shell/explorer-new/lang/en-US.rc index f24df7bc795..925640b9fd3 100644 --- a/reactos/base/shell/explorer-new/lang/en-US.rc +++ b/reactos/base/shell/explorer-new/lang/en-US.rc @@ -29,7 +29,7 @@ BEGIN POPUP "&Settings", IDM_SETTINGS BEGIN MENUITEM "&Control Panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Security...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Network Connections", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Printers and Faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Help and Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Run...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/es-ES.rc b/reactos/base/shell/explorer-new/lang/es-ES.rc index 5762caaba82..263d0e58d34 100644 --- a/reactos/base/shell/explorer-new/lang/es-ES.rc +++ b/reactos/base/shell/explorer-new/lang/es-ES.rc @@ -37,7 +37,7 @@ BEGIN POPUP "&Configuraciуn", IDM_SETTINGS BEGIN MENUITEM "&Panel de Control", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Seguridad...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Conexiones de red", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Impresoras y faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ BEGIN END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Ayuda y soporte tйcnico", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Ejecutar...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/fr-FR.rc b/reactos/base/shell/explorer-new/lang/fr-FR.rc index 238fa362b48..f0b92e71a98 100644 --- a/reactos/base/shell/explorer-new/lang/fr-FR.rc +++ b/reactos/base/shell/explorer-new/lang/fr-FR.rc @@ -29,7 +29,7 @@ BEGIN POPUP "Paramиtre&s", IDM_SETTINGS BEGIN MENUITEM "Panneau de &contrфle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sйcuritй...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Co&nnexions au rйseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "&Chercher", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Exйcuter...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/it-IT.rc b/reactos/base/shell/explorer-new/lang/it-IT.rc index d01e455d90c..30688b3572b 100644 --- a/reactos/base/shell/explorer-new/lang/it-IT.rc +++ b/reactos/base/shell/explorer-new/lang/it-IT.rc @@ -29,7 +29,7 @@ BEGIN POPUP "&Impostazioni", IDM_SETTINGS BEGIN MENUITEM "&Pannello di controllo", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicurezza...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Connessioni di rete", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Fax e stampanti", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "Cerca", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Aiuto e supporto", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Esegui...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/pl-PL.rc b/reactos/base/shell/explorer-new/lang/pl-PL.rc index a73f6cbda1b..05a3da9f046 100644 --- a/reactos/base/shell/explorer-new/lang/pl-PL.rc +++ b/reactos/base/shell/explorer-new/lang/pl-PL.rc @@ -31,7 +31,7 @@ BEGIN POPUP "Us&tawienia", IDM_SETTINGS BEGIN MENUITEM "P&anel sterowania", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Za&bezpieczenia...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "P&oі№czenia sieciowe", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ BEGIN END POPUP "&Szukaj", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/ru-RU.rc b/reactos/base/shell/explorer-new/lang/ru-RU.rc index 1edadf806d1..16d377aa0df 100644 --- a/reactos/base/shell/explorer-new/lang/ru-RU.rc +++ b/reactos/base/shell/explorer-new/lang/ru-RU.rc @@ -31,7 +31,7 @@ BEGIN POPUP "&Настройки", IDM_SETTINGS BEGIN MENUITEM "&Панель управления", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Безопасность...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Сетевые подключения", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Принтеры и факсы", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ BEGIN END POPUP "П&оиск", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Сп&равка и поддержка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Запус&к...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/sk-SK.rc b/reactos/base/shell/explorer-new/lang/sk-SK.rc index 608b9c68af8..eeb46c10b8f 100644 --- a/reactos/base/shell/explorer-new/lang/sk-SK.rc +++ b/reactos/base/shell/explorer-new/lang/sk-SK.rc @@ -29,7 +29,7 @@ BEGIN POPUP "Nastav&enia", IDM_SETTINGS BEGIN MENUITEM "&Ovlбdaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Zabezpeиenie systйmu ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Sieќovй pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Tlaиiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ BEGIN END POPUP "&Hѕadaќ", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Pomoc a technickб podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Sp&ustiќ...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/lang/uk-UA.rc b/reactos/base/shell/explorer-new/lang/uk-UA.rc index b46c70357d9..7148f0b9a50 100644 --- a/reactos/base/shell/explorer-new/lang/uk-UA.rc +++ b/reactos/base/shell/explorer-new/lang/uk-UA.rc @@ -37,7 +37,7 @@ BEGIN POPUP "Н&астройка", IDM_SETTINGS BEGIN MENUITEM "П&анель керування", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Безпека...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Мережні підключення", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Пр&интери й факси", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ BEGIN END POPUP "З&найти", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Довідка та підтримка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Запуск про&грами...", IDM_RUN, MFT_STRING, MFS_ENABLED diff --git a/reactos/base/shell/explorer-new/startmnu.c b/reactos/base/shell/explorer-new/startmnu.c index 598a6a00664..c34706f2315 100644 --- a/reactos/base/shell/explorer-new/startmnu.c +++ b/reactos/base/shell/explorer-new/startmnu.c @@ -100,35 +100,31 @@ OnStartContextMenuCommand(IN HWND hWndOwner, if (uiCmdId != 0) { - switch (uiCmdId) + if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) { - case ID_SHELL_CMD_FIRST ... ID_SHELL_CMD_LAST: + CMINVOKECOMMANDINFO cmici = {0}; + CHAR szDir[MAX_PATH]; + + /* Setup and invoke the shell command */ + cmici.cbSize = sizeof(cmici); + cmici.hwnd = hWndOwner; + cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); + cmici.nShow = SW_NORMAL; + + /* FIXME: Support Unicode!!! */ + if (SHGetPathFromIDListA(psmcmc->pidl, + szDir)) { - CMINVOKECOMMANDINFO cmici = {0}; - CHAR szDir[MAX_PATH]; - - /* Setup and invoke the shell command */ - cmici.cbSize = sizeof(cmici); - cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); - cmici.nShow = SW_NORMAL; - - /* FIXME: Support Unicode!!! */ - if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) - { - cmici.lpDirectory = szDir; - } - - IContextMenu_InvokeCommand(psmcmc->pcm, - &cmici); - break; + cmici.lpDirectory = szDir; } - default: - ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, - uiCmdId); - break; + IContextMenu_InvokeCommand(psmcmc->pcm, + &cmici); + } + else + { + ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, + uiCmdId); } } @@ -804,15 +800,20 @@ UpdateStartMenu(IN OUT IMenuPopup *pMenuPopup, (PVOID)&pbb); if (SUCCEEDED(hRet)) { - hRet = IBanneredBar_SetBitmap(pbb, + // hRet = IBanneredBar_SetBitmap(pbb, + // hbmBanner); + hRet = pbb->lpVtbl->SetBitmap(pbb, hbmBanner); /* Update the icon size */ - hRet = IBanneredBar_SetIconSize(pbb, + //hRet = IBanneredBar_SetIconSize(pbb, + // bSmallIcons ? BMICON_SMALL : BMICON_LARGE); + hRet = pbb->lpVtbl->SetIconSize(pbb, bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - IBanneredBar_Release(pbb); + //IBanneredBar_Release(pbb); + pbb->lpVtbl->Release(pbb); } return hRet; @@ -861,9 +862,11 @@ CreateStartMenu(IN ITrayWindow *Tray, (PVOID*)&pIo); if (SUCCEEDED(hRet)) { - hRet = IInitializeObject_Initialize(pIo); + //hRet = IInitializeObject_Initialize(pIo); + hRet = pIo->lpVtbl->Initialize(pIo); - IInitializeObject_Release(pIo); + //IInitializeObject_Release(pIo); + pIo->lpVtbl->Release(pIo); } else hRet = S_OK;