[gedmurphy] 33213: - 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...
Author: gedmurphy Date: Thu May 1 09:52:11 2008 New Revision: 33213
URL: http://svn.reactos.org/svn/reactos?rev=33213&view=rev Log: - 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...
Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/startmnu.c
Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ 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 "Sieové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Tlaèiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ 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 @@ 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
Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/sta... ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Thu May 1 09:52:11 2008 @@ -100,35 +100,31 @@
if (uiCmdId != 0) { - switch (uiCmdId) - { - case ID_SHELL_CMD_FIRST ... ID_SHELL_CMD_LAST: + if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= 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 @@ (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 @@ (PVOID*)&pIo); if (SUCCEEDED(hRet)) { - hRet = IInitializeObject_Initialize(pIo); - - IInitializeObject_Release(pIo); + //hRet = IInitializeObject_Initialize(pIo); + hRet = pIo->lpVtbl->Initialize(pIo); + + //IInitializeObject_Release(pIo); + pIo->lpVtbl->Release(pIo); } else hRet = S_OK;
-
gedmurphy＠svn.reactos.org