Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [EXPLORER] Implement HSHELL_ACTIVATESHELLWINDOW (#3125)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb529605a60c06d369b2d… commit fb529605a60c06d369b2dcf4c06a0d8e0c63c088 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 5 18:46:49 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 5 18:46:49 2020 +0900 [EXPLORER] Implement HSHELL_ACTIVATESHELLWINDOW (#3125) Implement HSHELL_ACTIVATESHELLWINDOW shell hook. --- base/shell/explorer/taskswnd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 17d11e27ed0..f8f4147c225 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1533,6 +1533,10 @@ public: break; case HSHELL_ACTIVATESHELLWINDOW: + ::SwitchToThisWindow(m_Tray->GetHWND(), TRUE); + ::SetForegroundWindow(m_Tray->GetHWND()); + break; + case HSHELL_LANGUAGE: case HSHELL_SYSMENU: case HSHELL_ENDTASK:

4 years, 3 months

[reactos] 01/01: [CMD] Code formatting for IsValidPathName, IsExistingFile, IsExistingDirectory, and use INVALID_FILE_ATTRIBUTES instead of an hardcoded value.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=050df0f56df52aaf628e4… commit 050df0f56df52aaf628e4cc5dedd9799e42c9489 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 4 00:17:15 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 4 00:24:45 2020 +0200 [CMD] Code formatting for IsValidPathName, IsExistingFile, IsExistingDirectory, and use INVALID_FILE_ATTRIBUTES instead of an hardcoded value. --- base/shell/cmd/cmd.h | 7 ++++--- base/shell/cmd/filecomp.c | 4 ++-- base/shell/cmd/if.c | 2 +- base/shell/cmd/misc.c | 28 +++++++++++++--------------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index c4b4cca90ca..205ff8ef7fe 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -297,9 +297,10 @@ LPTSTR *splitspace (LPTSTR, LPINT); VOID freep (LPTSTR *); LPTSTR _stpcpy (LPTSTR, LPCTSTR); VOID StripQuotes(LPTSTR); -BOOL IsValidPathName (LPCTSTR); -BOOL IsExistingFile (LPCTSTR); -BOOL IsExistingDirectory (LPCTSTR); + +BOOL IsValidPathName(IN LPCTSTR pszPath); +BOOL IsExistingFile(IN LPCTSTR pszPath); +BOOL IsExistingDirectory(IN LPCTSTR pszPath); VOID GetPathCase(TCHAR *, TCHAR *); #define PROMPT_NO 0 diff --git a/base/shell/cmd/filecomp.c b/base/shell/cmd/filecomp.c index 060b2122c02..9dfa2943fdc 100644 --- a/base/shell/cmd/filecomp.c +++ b/base/shell/cmd/filecomp.c @@ -532,7 +532,7 @@ FileNameContainsSpecialCharacters(LPTSTR pszFileName) (chr == _T('^')) || (chr == _T('~')) || (chr == _T('+')) || - (chr == 0xB4)) // '�' + (chr == 0xB4)) // '´' { return TRUE; } @@ -669,7 +669,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) /* Don't show files when they are doing 'cd' or 'rd' */ if (!ShowAll && - file.dwFileAttributes != 0xFFFFFFFF && + file.dwFileAttributes != INVALID_FILE_ATTRIBUTES && !(file.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { continue; diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index 66526ee154a..e219a3db225 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -138,7 +138,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) attrs = GetFileAttributes(Right); } - if (attrs == 0xFFFFFFFF) + if (attrs == INVALID_FILE_ATTRIBUTES) result = FALSE; else if (IsDir) result = ((attrs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index cd7a08f7722..97b252e50ed 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -477,36 +477,34 @@ StripQuotes(TCHAR *in) /* - * Checks if a path is valid (accessible) + * Checks if a path is valid (is accessible) */ -BOOL IsValidPathName (LPCTSTR pszPath) +BOOL IsValidPathName(IN LPCTSTR pszPath) { - TCHAR szOldPath[MAX_PATH]; BOOL bResult; + TCHAR szOldPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szOldPath); - bResult = SetCurrentDirectory (pszPath); + GetCurrentDirectory(ARRAYSIZE(szOldPath), szOldPath); + bResult = SetCurrentDirectory(pszPath); - SetCurrentDirectory (szOldPath); + SetCurrentDirectory(szOldPath); return bResult; } - /* - * Checks if a file exists (accessible) + * Checks if a file exists (is accessible) */ -BOOL IsExistingFile (LPCTSTR pszPath) +BOOL IsExistingFile(IN LPCTSTR pszPath) { - DWORD attr = GetFileAttributes (pszPath); - return (attr != 0xFFFFFFFF && (! (attr & FILE_ATTRIBUTE_DIRECTORY)) ); + DWORD attr = GetFileAttributes(pszPath); + return ((attr != INVALID_FILE_ATTRIBUTES) && !(attr & FILE_ATTRIBUTE_DIRECTORY)); } - -BOOL IsExistingDirectory (LPCTSTR pszPath) +BOOL IsExistingDirectory(IN LPCTSTR pszPath) { - DWORD attr = GetFileAttributes (pszPath); - return (attr != 0xFFFFFFFF && (attr & FILE_ATTRIBUTE_DIRECTORY) ); + DWORD attr = GetFileAttributes(pszPath); + return ((attr != INVALID_FILE_ATTRIBUTES) && (attr & FILE_ATTRIBUTE_DIRECTORY)); }

4 years, 3 months

[reactos] 01/01: [SETUP] French translation of missing elements (#3111)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5634138c37263f6bcb65… commit a5634138c37263f6bcb65700055c0f90ab63fe0d Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu Sep 3 21:20:54 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 3 21:20:54 2020 +0200 [SETUP] French translation of missing elements (#3111) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/setup/usetup/lang/fr-FR.h | 68 +++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index aeb2913ffee..263e73a62f6 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -192,63 +192,63 @@ static MUI_ENTRY frFRIntroPageEntries[] = { 6, 8, - "ReactOS Version Status", + "Statut de version de ReactOS", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "ReactOS est en version Alpha, ce qui signifie qu'il n'est pas complet", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "et est en cours de d\202veloppement. Il est recommand\202 de ne l'utiliser", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "que pour \202valuation et test, pas pour un usage quotidien.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "Sauvegardez vos donn\202es ou testez sur un ordinateur secondaire", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "to run ReactOS on real hardware.", + "si vous souhaitez utiliser ReactOS sur du mat\202riel.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "\x07 Appuyez sur ENTR\220E pour continuer l'installation de ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 Appuyez sur F3 pour quitter sans installer ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTR\220E = Continuer F3 = Quitter", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -279,112 +279,126 @@ static MUI_ENTRY frFRLicensePageEntries[] = { 8, 8, - "The ReactOS System is licensed under the terms of the", + "Le syst\212me ReactOS est distribu\202 sous les termes de", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 9, - "GNU GPL with parts containing code from other compatible", + "la licence GNU GPL avec des parties contenant du code sous", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 10, - "licenses such as the X11 or BSD and GNU LGPL licenses.", + "d'autres licences compatibles telles que X11, BSD et GNU LGPL.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 11, - "All software that is part of the ReactOS system is", + "Tout le logiciel constituant le syst\212me ReactOS est", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "therefore released under the GNU GPL as well as maintaining", + "par cons\202quent distribu\202 sous licence GNU GPL tout en", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "the original license.", + "maintenant la licence d'origine.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "This software comes with NO WARRANTY or restrictions on usage", + "Ce logiciel vient SANS GARANTIE ou restriction d'usage", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 16, - "save applicable local and international law. The licensing of", + "sous les lois locales ou internationales applicables.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 17, - "ReactOS only covers distribution to third parties.", + "La licence de ReactOS ne couvre que la distribution", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 18, - "If for some reason you did not receive a copy of the", + "aux tierces parties.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 19, - "GNU General Public License with ReactOS please visit", + "Si vous n'avez pas obtenu une copie de la", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 20, + "GNU General Public License avec ReactOS veuillez visiter", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 8, + 21, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 8, - 22, + 23, "Garantie :", TEXT_STYLE_HIGHLIGHT, TEXT_ID_STATIC }, { 8, - 24, - "This is free software; see the source for copying conditions.", + 25, + "Ce logiciel est gratuit. Voir les sources pour les", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, - 25, - "There is NO warranty; not even for MERCHANTABILITY or", + 26, + "conditions de copie.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, - 26, - "FITNESS FOR A PARTICULAR PURPOSE", + 27, + "Il n'y a AUCUNE garantie; pas m\210me sur la QUALIT\220 ou", + TEXT_STYLE_NORMAL, + TEXT_ID_STATIC + }, + { + 8, + 28, + "l'AD\220QUATION POUR UN USAGE EN PARTICULIER", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

4 years, 3 months

[reactos] 01/01: [CMD] IF: Add extra validity checks in ExecuteIf().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c81bf4f823aa09448a583… commit c81bf4f823aa09448a58331b5c3e38f88416c208 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 3 16:03:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 3 16:05:55 2020 +0200 [CMD] IF: Add extra validity checks in ExecuteIf(). --- base/shell/cmd/cmd.c | 2 +- base/shell/cmd/if.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index fbc12154d1b..f760bf7745c 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -938,7 +938,7 @@ GetEnvVarOrSpecial(LPCTSTR varName) /* %CMDEXTVERSION% */ else if (_tcsicmp(varName, _T("CMDEXTVERSION")) == 0) { - /* Set version number to CMDEXTVERSION */ + /* Set Command Extensions version number to CMDEXTVERSION */ _itot(CMDEXTVERSION, ret, 10); return ret; } diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index e74298ad612..66526ee154a 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -78,20 +78,19 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) Right = DoDelayedExpansion(Cmd->If.RightArg); if (!Right) { - cmd_free(Left); + if (Left) cmd_free(Left); return 1; } if (bEnableExtensions && (Cmd->If.Operator == IF_CMDEXTVERSION)) { - /* IF CMDEXTVERSION n: check if Command Extensions version - * is greater or equal to n */ + /* IF CMDEXTVERSION n: check if Command Extensions + * version is greater or equal to n. */ DWORD n = _tcstoul(Right, &param, 10); if (*param != _T('\0')) { error_syntax(Right); - cmd_free(Right); - return 1; + goto fail; } result = (CMDEXTVERSION >= n); } @@ -107,8 +106,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) if (*param != _T('\0')) { error_syntax(Right); - cmd_free(Right); - return 1; + goto fail; } result = (nErrorLevel >= n); } @@ -178,11 +176,19 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) case IF_LEQ: result = (result <= 0); break; case IF_GTR: result = (result > 0); break; case IF_GEQ: result = (result >= 0); break; + default: goto unknownOp; } } + else + { +unknownOp: + ERR("Unknown IF operator 0x%x\n", Cmd->If.Operator); + ASSERT(FALSE); + goto fail; + } } - cmd_free(Left); + if (Left) cmd_free(Left); cmd_free(Right); if (result ^ ((Cmd->If.Flags & IFFLAG_NEGATE) != 0)) @@ -195,6 +201,11 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) /* Full condition was false, do the "else" command if there is one */ return ExecuteCommand(Cmd->Subcommands->Next); } + +fail: + if (Left) cmd_free(Left); + cmd_free(Right); + return 1; } /* EOF */

4 years, 3 months

[reactos] 01/01: [INETCPL] Update Hebrew translation (#3122)

by Omer Itzic S

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49972f51c6f4f45b314c4… commit 49972f51c6f4f45b314c406adc3d10a01797baa8 Author: Omer Itzic S <66558205+omeritzics(a)users.noreply.github.com> AuthorDate: Wed Sep 2 02:38:44 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 3 15:00:08 2020 +0300 [INETCPL] Update Hebrew translation (#3122) --- dll/cpl/inetcpl/lang/He.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc index 1ca433008c6..ee5bf9bb5e9 100644 --- a/dll/cpl/inetcpl/lang/He.rc +++ b/dll/cpl/inetcpl/lang/He.rc @@ -68,7 +68,7 @@ END IDD_DELETE_HISTORY DIALOGEX 0, 0, 250, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Delete browsing history" +CAPTION "מחק היסטוריית גלישה" BEGIN AUTOCHECKBOX "Temporary internet files\nCached copies of web pages, images and certificates.", @@ -125,7 +125,7 @@ END IDD_CONNECTIONS DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Connections" +CAPTION "חיבורים" BEGIN GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP

4 years, 3 months

[reactos] 01/01: [SHELL32] Big fix for change notification (#3048)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c134e4d14efa98eac47e… commit 7c134e4d14efa98eac47e8b6b4b3589d5db8f8ac Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 3 13:36:31 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 3 13:36:31 2020 +0900 [SHELL32] Big fix for change notification (#3048) - Reduced the failures of SHChangeNotify testcase. - Simplified change notification mechanism. - Realized PIDL aliasing. CORE-13950 --- dll/win32/shell32/CDefView.cpp | 33 +--- dll/win32/shell32/changenotify.cpp | 187 +++++++++++++++++++-- .../shell32/shelldesktop/CChangeNotifyServer.cpp | 117 +++++-------- dll/win32/shell32/shelldesktop/CDirectoryList.cpp | 10 ++ .../shell32/shelldesktop/CDirectoryWatcher.cpp | 5 +- dll/win32/shell32/stubs.cpp | 35 ---- dll/win32/shell32/wine/pidl.c | 8 +- 7 files changed, 244 insertions(+), 151 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 6948e572958..6495b08610e 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1166,39 +1166,14 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl SetShellWindowEx(hwndSB, m_ListView); } - INT nRegCount; - SHChangeNotifyEntry ntreg[3]; - PIDLIST_ABSOLUTE pidls[3]; - if (_ILIsDesktop(m_pidlParent)) - { - nRegCount = 3; - SHGetSpecialFolderLocation(m_hWnd, CSIDL_DESKTOPDIRECTORY, &pidls[0]); - SHGetSpecialFolderLocation(m_hWnd, CSIDL_COMMON_DESKTOPDIRECTORY, &pidls[1]); - SHGetSpecialFolderLocation(m_hWnd, CSIDL_BITBUCKET, &pidls[2]); - ntreg[0].fRecursive = FALSE; - ntreg[0].pidl = pidls[0]; - ntreg[1].fRecursive = FALSE; - ntreg[1].pidl = pidls[1]; - ntreg[2].fRecursive = FALSE; - ntreg[2].pidl = pidls[2]; - } - else - { - nRegCount = 1; - ntreg[0].fRecursive = FALSE; - ntreg[0].pidl = m_pidlParent; - } + SHChangeNotifyEntry ntreg[1]; + ntreg[0].fRecursive = FALSE; + ntreg[0].pidl = m_pidlParent; m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_InterruptLevel | SHCNRF_ShellLevel | SHCNRF_NewDelivery, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, - nRegCount, ntreg); - if (nRegCount == 3) - { - ILFree(pidls[0]); - ILFree(pidls[1]); - ILFree(pidls[2]); - } + 1, ntreg); /* _DoFolderViewCB(SFVM_GETNOTIFY, ?? ??) */ diff --git a/dll/win32/shell32/changenotify.cpp b/dll/win32/shell32/changenotify.cpp index ae5e0e8bdb4..08a7e632eba 100644 --- a/dll/win32/shell32/changenotify.cpp +++ b/dll/win32/shell32/changenotify.cpp @@ -294,13 +294,16 @@ CreateRegistrationParam(ULONG nRegID, HWND hwnd, UINT wMsg, INT fSources, LONG f // It creates a delivery ticket and send CN_DELIVER_NOTIFICATION message to // transport the change. static void -CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPITEMIDLIST pidl1, LPITEMIDLIST pidl2, +CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) { // get server window HWND hwndServer = GetNotificationServer(FALSE); if (hwndServer == NULL) + { + ERR("hwndServer == NULL\n"); return; + } // the ticket owner is the process of the notification server DWORD pid; @@ -314,10 +317,79 @@ CreateNotificationParamAndSend(LONG wEventId, UINT uFlags, LPITEMIDLIST pidl1, L TRACE("hTicket: %p, 0x%lx\n", hTicket, pid); // send the ticket by using CN_DELIVER_NOTIFICATION - if ((uFlags & (SHCNF_FLUSH | SHCNF_FLUSHNOWAIT)) == SHCNF_FLUSH) + if (pid != GetCurrentProcessId() || + (uFlags & (SHCNF_FLUSH | SHCNF_FLUSHNOWAIT)) == SHCNF_FLUSH) + { SendMessageW(hwndServer, CN_DELIVER_NOTIFICATION, (WPARAM)hTicket, pid); + } else + { SendNotifyMessageW(hwndServer, CN_DELIVER_NOTIFICATION, (WPARAM)hTicket, pid); + } +} + +struct ALIAS_PIDL +{ + INT csidl1; // from + INT csidl2; // to + LPITEMIDLIST pidl1; // from + LPITEMIDLIST pidl2; // to + WCHAR szPath1[MAX_PATH]; // from + WCHAR szPath2[MAX_PATH]; // to +}; + +static ALIAS_PIDL AliasPIDLs[] = +{ + { CSIDL_PERSONAL, CSIDL_PERSONAL }, + { CSIDL_DESKTOP, CSIDL_COMMON_DESKTOPDIRECTORY, }, + { CSIDL_DESKTOP, CSIDL_DESKTOPDIRECTORY }, +}; + +static VOID DoInitAliasPIDLs(void) +{ + static BOOL s_bInit = FALSE; + if (!s_bInit) + { + for (SIZE_T i = 0; i < _countof(AliasPIDLs); ++i) + { + ALIAS_PIDL *alias = &AliasPIDLs[i]; + + SHGetSpecialFolderLocation(NULL, alias->csidl1, &alias->pidl1); + SHGetPathFromIDListW(alias->pidl1, alias->szPath1); + + SHGetSpecialFolderLocation(NULL, alias->csidl2, &alias->pidl2); + SHGetPathFromIDListW(alias->pidl2, alias->szPath2); + } + s_bInit = TRUE; + } +} + +static BOOL DoGetAliasPIDLs(LPITEMIDLIST apidls[2], PCIDLIST_ABSOLUTE pidl) +{ + DoInitAliasPIDLs(); + + apidls[0] = apidls[1] = NULL; + + INT k = 0; + for (SIZE_T i = 0; i < _countof(AliasPIDLs); ++i) + { + const ALIAS_PIDL *alias = &AliasPIDLs[i]; + if (ILIsEqual(pidl, alias->pidl1)) + { + if (alias->csidl1 == alias->csidl2) + { + apidls[k++] = ILCreateFromPathW(alias->szPath2); + } + else + { + apidls[k++] = ILClone(alias->pidl2); + } + if (k >= 2) + break; + } + } + + return k > 0; } /************************************************************************* @@ -349,11 +421,10 @@ SHChangeNotifyRegister(HWND hwnd, INT fSources, LONG wEventMask, UINT uMsg, if (hwndServer == NULL) return INVALID_REG_ID; - // disable new delivery method in specific condition - if ((fSources & SHCNRF_RecursiveInterrupt) != 0 && - (fSources & SHCNRF_InterruptLevel) == 0) + // disable recursive interrupt in specific condition + if ((fSources & SHCNRF_RecursiveInterrupt) && !(fSources & SHCNRF_InterruptLevel)) { - fSources &= ~SHCNRF_NewDelivery; + fSources &= ~SHCNRF_RecursiveInterrupt; } // if it is old delivery method, then create a broker window @@ -393,13 +464,62 @@ SHChangeNotifyRegister(HWND hwnd, INT fSources, LONG wEventMask, UINT uMsg, SHFreeShared(hRegEntry, dwOwnerPID); } - // if failed, then destroy the broker - if (nRegID == INVALID_REG_ID && (fSources & SHCNRF_NewDelivery) == 0) + if (nRegID == INVALID_REG_ID) { ERR("Delivery failed\n"); - DestroyWindow(hwndBroker); + + if (hwndBroker) + { + // destroy the broker + DestroyWindow(hwndBroker); + } break; } + + // PIDL alias + LPITEMIDLIST apidlAlias[2]; + if (DoGetAliasPIDLs(apidlAlias, lpItems[iItem].pidl)) + { + if (apidlAlias[0]) + { + // create another registration entry + hRegEntry = CreateRegistrationParam(nRegID, hwnd, uMsg, fSources, wEventMask, + lpItems[iItem].fRecursive, apidlAlias[0], + dwOwnerPID, hwndBroker); + if (hRegEntry) + { + TRACE("CN_REGISTER: hwnd:%p, hRegEntry:%p, pid:0x%lx\n", + hwndServer, hRegEntry, dwOwnerPID); + + // send CN_REGISTER to the server + SendMessageW(hwndServer, CN_REGISTER, (WPARAM)hRegEntry, dwOwnerPID); + + // free registration entry + SHFreeShared(hRegEntry, dwOwnerPID); + } + ILFree(apidlAlias[0]); + } + + if (apidlAlias[1]) + { + // create another registration entry + hRegEntry = CreateRegistrationParam(nRegID, hwnd, uMsg, fSources, wEventMask, + lpItems[iItem].fRecursive, apidlAlias[1], + dwOwnerPID, hwndBroker); + if (hRegEntry) + { + TRACE("CN_REGISTER: hwnd:%p, hRegEntry:%p, pid:0x%lx\n", + hwndServer, hRegEntry, dwOwnerPID); + + // send CN_REGISTER to the server + SendMessageW(hwndServer, CN_REGISTER, (WPARAM)hRegEntry, dwOwnerPID); + + // free registration entry + SHFreeShared(hRegEntry, dwOwnerPID); + } + ILFree(apidlAlias[1]); + } + } } LeaveCriticalSection(&SHELL32_ChangenotifyCS); @@ -472,6 +592,39 @@ static LPCSTR DumpEvent(LONG event) #undef DUMPEV } +/************************************************************************* + * SHChangeRegistrationReceive [SHELL32.646] + */ +EXTERN_C BOOL WINAPI +SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) +{ + FIXME("SHChangeRegistrationReceive() stub\n"); + return FALSE; +} + +EXTERN_C VOID WINAPI +SHChangeNotifyReceiveEx(LONG lEvent, UINT uFlags, + LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) +{ + // TODO: Queueing notifications + CreateNotificationParamAndSend(lEvent, uFlags, pidl1, pidl2, dwTick); +} + +/************************************************************************* + * SHChangeNotifyReceive [SHELL32.643] + */ +EXTERN_C VOID WINAPI +SHChangeNotifyReceive(LONG lEvent, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + SHChangeNotifyReceiveEx(lEvent, uFlags, pidl1, pidl2, GetTickCount()); +} + +EXTERN_C VOID WINAPI +SHChangeNotifyTransmit(LONG lEvent, UINT uFlags, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, DWORD dwTick) +{ + SHChangeNotifyReceiveEx(lEvent, uFlags, pidl1, pidl2, dwTick); +} + /************************************************************************* * SHChangeNotify [SHELL32.@] */ @@ -532,7 +685,7 @@ SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2) if (wEventId == 0 || (wEventId & SHCNE_ASSOCCHANGED) || pidl1 != NULL) { TRACE("notifying event %s(%x)\n", DumpEvent(wEventId), wEventId); - CreateNotificationParamAndSend(wEventId, uFlags, pidl1, pidl2, dwTick); + SHChangeNotifyTransmit(wEventId, uFlags, pidl1, pidl2, dwTick); } if (pidlTemp1) @@ -610,3 +763,17 @@ NTSHChangeNotifyDeregister(ULONG hNotify) FIXME("(0x%08x):semi stub.\n", hNotify); return SHChangeNotifyDeregister(hNotify); } + +/************************************************************************* + * SHChangeNotifySuspendResume [SHELL32.277] + */ +EXTERN_C BOOL +WINAPI +SHChangeNotifySuspendResume(BOOL bSuspend, + LPITEMIDLIST pidl, + BOOL bRecursive, + DWORD dwReserved) +{ + FIXME("SHChangeNotifySuspendResume() stub\n"); + return FALSE; +} diff --git a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp index 2186fe20ca4..c0835faa919 100644 --- a/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp +++ b/dll/win32/shell32/shelldesktop/CChangeNotifyServer.cpp @@ -11,8 +11,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); -// TODO: SHCNRF_RecursiveInterrupt - ////////////////////////////////////////////////////////////////////////////// // notification target item @@ -188,10 +186,6 @@ CreateDirectoryWatcherFromRegEntry(LPREGENTRY pRegEntry) if (pRegEntry->ibPidl == 0) return NULL; - // it must be interrupt level if pRegEntry is a filesystem watch - if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) - return NULL; - // get the path WCHAR szPath[MAX_PATH]; LPITEMIDLIST pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); @@ -249,13 +243,18 @@ LRESULT CChangeNotifyServer::OnRegister(UINT uMsg, WPARAM wParam, LPARAM lParam, } // create a directory watch if necessary - CDirectoryWatcher *pDirWatch = CreateDirectoryWatcherFromRegEntry(pRegEntry); - if (pDirWatch && !pDirWatch->RequestAddWatcher()) + CDirectoryWatcher *pDirWatch = NULL; + if (pRegEntry->ibPidl && (pRegEntry->fSources & SHCNRF_InterruptLevel)) { - pRegEntry->nRegID = INVALID_REG_ID; - SHUnlockShared(pRegEntry); - delete pDirWatch; - return FALSE; + pDirWatch = CreateDirectoryWatcherFromRegEntry(pRegEntry); + if (pDirWatch && !pDirWatch->RequestAddWatcher()) + { + ERR("RequestAddWatcher failed: %u\n", pRegEntry->nRegID); + pRegEntry->nRegID = INVALID_REG_ID; + SHUnlockShared(pRegEntry); + delete pDirWatch; + return FALSE; + } } // unlock the registry entry @@ -386,6 +385,7 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) TRACE("Notifying: %p, 0x%x, %p, %lu\n", pRegEntry->hwnd, pRegEntry->uMsg, hTicket, dwOwnerPID); SendMessageW(pRegEntry->hwnd, pRegEntry->uMsg, (WPARAM)hTicket, dwOwnerPID); + TRACE("GetLastError(): %ld\n", ::GetLastError()); } // unlock the registration entry @@ -400,91 +400,58 @@ BOOL CChangeNotifyServer::DeliverNotification(HANDLE hTicket, DWORD dwOwnerPID) BOOL CChangeNotifyServer::ShouldNotify(LPDELITICKET pTicket, LPREGENTRY pRegEntry) { - LPITEMIDLIST pidl, pidl1 = NULL, pidl2 = NULL; - WCHAR szPath[MAX_PATH], szPath1[MAX_PATH], szPath2[MAX_PATH]; - INT cch, cch1, cch2; +#define RETURN(x) do { \ + TRACE("ShouldNotify return %d\n", (x)); \ + return (x); \ +} while (0) - // check fSources - if (pTicket->uFlags & SHCNE_INTERRUPT) + if (pTicket->wEventId & SHCNE_INTERRUPT) { if (!(pRegEntry->fSources & SHCNRF_InterruptLevel)) - return FALSE; + RETURN(FALSE); + if (!pRegEntry->ibPidl) + RETURN(FALSE); } else { if (!(pRegEntry->fSources & SHCNRF_ShellLevel)) - return FALSE; + RETURN(FALSE); } - if (pRegEntry->ibPidl == 0) - return TRUE; // there is no PIDL - - // get the stored pidl - pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); - if (pidl->mkid.cb == 0 && pRegEntry->fRecursive) - return TRUE; // desktop is the root + if (!(pTicket->wEventId & pRegEntry->fEvents)) + RETURN(FALSE); - // check pidl1 + LPITEMIDLIST pidl = NULL, pidl1 = NULL, pidl2 = NULL; + if (pRegEntry->ibPidl) + pidl = (LPITEMIDLIST)((LPBYTE)pRegEntry + pRegEntry->ibPidl); if (pTicket->ibOffset1) - { pidl1 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset1); - if (ILIsEqual(pidl, pidl1) || ILIsParent(pidl, pidl1, !pRegEntry->fRecursive)) - return TRUE; - } - - // check pidl2 if (pTicket->ibOffset2) - { pidl2 = (LPITEMIDLIST)((LPBYTE)pTicket + pTicket->ibOffset2); - if (ILIsEqual(pidl, pidl2) || ILIsParent(pidl, pidl2, !pRegEntry->fRecursive)) - return TRUE; - } - // The paths: - // "C:\\Path\\To\\File1" - // "C:\\Path\\To\\File1Test" - // should be distinguished in comparison, so we add backslash at last as follows: - // "C:\\Path\\To\\File1\\" - // "C:\\Path\\To\\File1Test\\" - if (SHGetPathFromIDListW(pidl, szPath)) - { - PathAddBackslashW(szPath); - cch = lstrlenW(szPath); + if (pidl == NULL || (pTicket->wEventId & SHCNE_GLOBALEVENTS)) + RETURN(TRUE); - if (pidl1 && SHGetPathFromIDListW(pidl1, szPath1)) + if (pRegEntry->fRecursive) + { + if (ILIsParent(pidl, pidl1, FALSE) || + (pidl2 && ILIsParent(pidl, pidl2, FALSE))) { - PathAddBackslashW(szPath1); - cch1 = lstrlenW(szPath1); - - // Is szPath1 a subfile or subdirectory of szPath? - if (cch < cch1 && - (pRegEntry->fRecursive || - wcschr(&szPath1[cch], L'\\') == &szPath1[cch1 - 1])) - { - szPath1[cch] = 0; - if (lstrcmpiW(szPath, szPath1) == 0) - return TRUE; - } + RETURN(TRUE); } - - if (pidl2 && SHGetPathFromIDListW(pidl2, szPath2)) + } + else + { + if (ILIsEqual(pidl, pidl1) || + ILIsParent(pidl, pidl1, TRUE) || + (pidl2 && ILIsParent(pidl, pidl2, TRUE))) { - PathAddBackslashW(szPath2); - cch2 = lstrlenW(szPath2); - - // Is szPath2 a subfile or subdirectory of szPath? - if (cch < cch2 && - (pRegEntry->fRecursive || - wcschr(&szPath2[cch], L'\\') == &szPath2[cch2 - 1])) - { - szPath2[cch] = 0; - if (lstrcmpiW(szPath, szPath2) == 0) - return TRUE; - } + RETURN(TRUE); } } - return FALSE; + RETURN(FALSE); +#undef RETURN } HRESULT WINAPI CChangeNotifyServer::GetWindow(HWND* phwnd) diff --git a/dll/win32/shell32/shelldesktop/CDirectoryList.cpp b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp index eff446df467..2bdd36f0eb0 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryList.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryList.cpp @@ -28,6 +28,16 @@ BOOL CDirectoryList::ContainsPath(LPCWSTR pszPath) const BOOL CDirectoryList::AddPath(LPCWSTR pszPath) { assert(!PathIsRelativeW(pszPath)); + if (ContainsPath(pszPath)) + return FALSE; + for (INT i = 0; i < m_items.GetSize(); ++i) + { + if (m_items[i].IsEmpty()) + { + m_items[i].SetPath(pszPath); + return TRUE; + } + } return m_items.Add(pszPath); } diff --git a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp index 9a206ac673a..1e4a7015287 100644 --- a/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp +++ b/dll/win32/shell32/shelldesktop/CDirectoryWatcher.cpp @@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shcn); static inline void NotifyFileSystemChange(LONG wEventId, LPCWSTR path1, LPCWSTR path2) { - SHChangeNotify(wEventId | SHCNE_INTERRUPT, SHCNF_PATHW, path1, path2); + SHChangeNotify(wEventId | SHCNE_INTERRUPT, SHCNF_PATHW | SHCNF_FLUSH, path1, path2); } // The handle of the APC thread @@ -138,6 +138,7 @@ void CDirectoryWatcher::ProcessNotification() WCHAR szName[MAX_PATH], szPath[MAX_PATH], szTempPath[MAX_PATH]; DWORD dwEvent, cbName; BOOL fDir; + TRACE("CDirectoryWatcher::ProcessNotification: enter\n"); // for each entry in s_buffer szPath[0] = szTempPath[0] = 0; @@ -225,6 +226,8 @@ void CDirectoryWatcher::ProcessNotification() // go next entry pInfo = (PFILE_NOTIFY_INFORMATION)((LPBYTE)pInfo + pInfo->NextEntryOffset); } + + TRACE("CDirectoryWatcher::ProcessNotification: leave\n"); } void CDirectoryWatcher::ReadCompletion(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ebba2f3b298..a995e395509 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -329,17 +329,6 @@ CDefFolderMenu_Create(LPITEMIDLIST pidlFolder, return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHChangeRegistrationReceive(LPVOID lpUnknown1, DWORD dwUnknown2) -{ - FIXME("SHChangeRegistrationReceive() stub\n"); - return FALSE; -} - /* * Unimplemented */ @@ -350,16 +339,6 @@ SHWaitOp_Operate(LPVOID lpUnknown1, DWORD dwUnknown2) FIXME("SHWaitOp_Operate() stub\n"); } -/* - * Unimplemented - */ -EXTERN_C VOID -WINAPI -SHChangeNotifyReceive(LONG lUnknown, UINT uUnknown, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - FIXME("SHChangeNotifyReceive() stub\n"); -} - /* * Unimplemented */ @@ -625,20 +604,6 @@ SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi) return FALSE; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHChangeNotifySuspendResume(BOOL bSuspend, - LPITEMIDLIST pidl, - BOOL bRecursive, - DWORD dwReserved) -{ - FIXME("SHChangeNotifySuspendResume() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c index a813f9293cd..1f27557db9b 100644 --- a/dll/win32/shell32/wine/pidl.c +++ b/dll/win32/shell32/wine/pidl.c @@ -1101,8 +1101,13 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) MultiByteToWideChar(CP_ACP, 0, lpszPath, -1, wPath, len); } #ifdef __REACTOS__ + // FIXME: Needs folder attribute if (PathFileExistsW(wPath)) - return ILCreateFromPathW(wPath); + { + pidl = ILCreateFromPathW(wPath); + HeapFree(GetProcessHeap(), 0, wPath); + return pidl; + } #endif _ILParsePathW(wPath, NULL, TRUE, &pidl, NULL); @@ -1118,6 +1123,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathW(LPCWSTR lpszPath) TRACE("%s\n", debugstr_w(lpszPath)); #ifdef __REACTOS__ + // FIXME: Needs folder attribute if (PathFileExistsW(lpszPath)) return ILCreateFromPathW(lpszPath); #endif

4 years, 3 months

[reactos] 02/02: [CMAKE] Overhaul creation from CD

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ffb6a09c370ef51de554… commit 7ffb6a09c370ef51de554a1ce913f871d72b76ca Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 27 16:04:27 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Sep 2 11:02:44 2020 +0200 [CMAKE] Overhaul creation from CD Get rid of global properties and use a target-level properties instead Limit temporary files by using cmake-generator expressions instead Avoid function calls at the end configuration, use file(GENERATE) idiom instead --- CMakeLists.txt | 3 - boot/CMakeLists.txt | 117 +++++++++++---------- boot/bootdata/packages/CMakeLists.txt | 27 ++++- sdk/cmake/CMakeMacros.cmake | 192 +++++++++++----------------------- 4 files changed, 144 insertions(+), 195 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cbb6b3f190..b7f851df962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,9 +265,6 @@ else() # Create the registry hives create_registry_hives() - # Create {bootcd, livecd, bootcdregtest}.lst - create_iso_lists() - file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos) add_dependency_footer() diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index a18810d1e76..17bc2bdce61 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -60,44 +60,45 @@ set(ISO_VOLNAME "ReactOS") # For both the Volume ID and the Vol # Create user profile directories in the LiveImage -function(add_allusers_profile_dirs _image_filelist _rootdir) - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +function(add_allusers_profile_dirs _target _rootdir) + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") endfunction() -function(add_user_profile_dirs _image_filelist _rootdir _username) - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") - file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +function(add_user_profile_dirs _target _rootdir _username) + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Application Data/Microsoft/Internet Explorer/Quick Launch=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty") + set_property(TARGET ${_target} APPEND PROPERTY FILE_LIST "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty") endfunction() ## BootCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/bootcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 @@ -106,15 +107,16 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(bootcd DEPENDS ${REACTOS_BINARY_DIR}/bootcd.iso) ## BootCDRegTest -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:bootcdregtest,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/bootcdregtest.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 @@ -123,19 +125,16 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs $<TARGET_PROPERTY:bootcdregtest,ISO_DEPENDENCIES> VERBATIM) add_custom_target(bootcdregtest DEPENDS ${REACTOS_BINARY_DIR}/bootcdregtest.iso) ## LiveCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - -# Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") - +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:livecd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 @@ -144,19 +143,19 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso - DEPENDS isombr native-isohybrid native-mkisofs + DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/livecd.$<CONFIG>.lst $<TARGET_PROPERTY:livecd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) - -## HybridCD -# Create the file list -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "") -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - # Create user profile directories -add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") -add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") +add_allusers_profile_dirs(livecd "Profiles") +add_user_profile_dirs(livecd "Profiles" "Default User") +## HybridCD +# create file list on generation phase +file(GENERATE + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst + CONTENT $<GENEX_EVAL:$<JOIN:$<TARGET_PROPERTY:hybridcd,FILE_LIST>,\n>>) +# create target add_custom_command( OUTPUT ${REACTOS_BINARY_DIR}/hybridcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 @@ -165,11 +164,15 @@ add_custom_command( -sort ${CMAKE_CURRENT_BINARY_DIR}/bootfiles.sort -duplicates-once -no-cache-inodes -graft-points -path-list ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso - DEPENDS bootcd livecd + DEPENDS isombr native-isohybrid native-mkisofs ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.$<CONFIG>.lst $<TARGET_PROPERTY:hybridcd,ISO_DEPENDENCIES> VERBATIM) add_custom_target(hybridcd DEPENDS ${REACTOS_BINARY_DIR}/hybridcd.iso) +# Create user profile directories +add_allusers_profile_dirs(hybridcd "livecd/Profiles") +add_user_profile_dirs(livecd "livecd/Profiles" "Default User") add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd) +add_cd_file(TARGET livecd FILE ${REACTOS_BINARY_DIR}/livecd.iso DESTINATION livecd FOR hybridcd) add_subdirectory(freeldr) add_subdirectory(bootdata) diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index 3f1cc6ff00c..5ef12d6f107 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -31,20 +31,37 @@ add_custom_command( -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake - COMMAND ${CMAKE_COMMAND} -E copy_if_different + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn) -add_custom_target( - reactos_cab_inf +# reactos.inf. We want this command to be always executed, in case someone added an optional file between two builds. +# So we pretend it generates another file although it will never do. +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf native-cabman $<TARGET_PROPERTY:reactos_cab,CAB_DEPENDENCIES>) + +add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) + +add_cd_file( + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab + DESTINATION reactos + NO_CAB FOR bootcd regtest) + add_cd_file( - TARGET reactos_cab_inf - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos_real.inf + NAME_ON_CD reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 5ac5dec5555..a99c9ea3b03 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -309,7 +309,12 @@ macro(dir_to_num dir var) endmacro() function(add_cd_file) - cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET" "FILE;FOR" ${ARGN}) + cmake_parse_arguments(_CD "NO_CAB;NOT_IN_HYBRIDCD" "DESTINATION;NAME_ON_CD;TARGET;FILE" "FOR" ${ARGN}) + + if (_CD_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unexpected arguments to add_cd_file : ${_CD_UNPARSED_ARGUMENTS}") + endif() + if(NOT (_CD_TARGET OR _CD_FILE)) message(FATAL_ERROR "You must provide a target or a file to install!") endif() @@ -332,6 +337,10 @@ function(add_cd_file) endif() endif() + if (NOT _CD_NAME_ON_CD) + get_filename_component(_CD_NAME_ON_CD ${_CD_FILE} NAME) + endif() + # do we add it to all CDs? list(FIND _CD_FOR all __cd) if(NOT __cd EQUAL -1) @@ -339,42 +348,38 @@ function(add_cd_file) list(INSERT _CD_FOR __cd "bootcd;livecd;regtest") endif() + # do we add it to bootcd? list(FIND _CD_FOR bootcd __cd) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) # directly on cd - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) + set_property(TARGET bootcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + # add it also into the hybridcd if not specified otherwise + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + endif() + # manage dependency + if(_CD_TARGET) + set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) endif() - set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - # add it also into the hybridcd if not specified otherwise + else() + set_property(TARGET bootcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() - endforeach() - # manage dependency - if(_CD_TARGET) - add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() dir_to_num(${_CD_DESTINATION} _num) - foreach(item ${_CD_FILE}) - # add it in reactos.cab - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") - - # manage dependency - file level - set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) - endforeach() - - # manage dependency - target level + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") + # manage dependencies if(_CD_TARGET) - add_dependencies(reactos_cab_inf ${_CD_TARGET}) + set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET reactos_cab APPEND PROPERTY CAB_DEPENDENCIES ${_CD_FILE}) endif() endif() endif() #end bootcd @@ -384,39 +389,36 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # manage dependency if(_CD_TARGET) - add_dependencies(livecd ${_CD_TARGET} registry_inf) - endif() - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - # add it also into the hybridcd if not specified otherwise + set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) endif() - endforeach() + endif() + + set_property(TARGET livecd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + # manage dependency + if (NOT _CD_TARGET) + set_property(TARGET livecd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + endif() + # add it also into the hybridcd if not specified otherwise + if(NOT _CD_NOT_IN_HYBRIDCD) + set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "livecd/${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") + if (NOT _CD_TARGET) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) + endif() + endif() endif() #end livecd # do we need also to add it to hybridcd? list(FIND _CD_FOR hybridcd __cd) if(NOT __cd EQUAL -1) + set_property(TARGET hybridcd APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") # manage dependency if(_CD_TARGET) - add_dependencies(hybridcd ${_CD_TARGET}) + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET hybridcd APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - endforeach() endif() #end hybridcd # do we add it to regtest? @@ -424,19 +426,12 @@ function(add_cd_file) if(NOT __cd EQUAL -1) # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - # directly on cd - foreach(item ${_CD_FILE}) - if(_CD_NAME_ON_CD) - # rename it in the cd tree - set(__file ${_CD_NAME_ON_CD}) - else() - get_filename_component(__file ${item} NAME) - endif() - set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - endforeach() + set_property(TARGET bootcdregtest APPEND PROPERTY FILE_LIST "${_CD_DESTINATION}/${_CD_NAME_ON_CD}=${_CD_FILE}") # manage dependency if(_CD_TARGET) - add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) + set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_TARGET}) + else() + set_property(TARGET bootcdregtest APPEND PROPERTY ISO_DEPENDENCIES ${_CD_FILE}) endif() else() #add it in reactos.cab @@ -450,68 +445,6 @@ function(add_cd_file) endif() #end bootcd endfunction() -function(create_iso_lists) - # generate reactos.cab before anything else - get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) - - # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do. - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf - DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman ${_filelist}) - - add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) - add_dependencies(reactos_cab reactos_cab_inf) - - add_cd_file( - TARGET reactos_cab - FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - DESTINATION reactos - NO_CAB FOR bootcd regtest) - - add_cd_file( - FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION livecd - FOR hybridcd) - - get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/bootcd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/livecd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/livecd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY HYBRIDCD_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/hybridcd.cmake.lst) - - get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST) - string(REPLACE ";" "\n" _filelist "${_filelist}") - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst "${_filelist}") - unset(_filelist) - file(GENERATE - OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.$<CONFIG>.lst - INPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake.lst) -endfunction() - # Create module_clean targets function(add_clean_target _target) set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR}) @@ -887,15 +820,11 @@ function(create_registry_hives) ${CMAKE_BINARY_DIR}/boot/bootdata/sam ${CMAKE_BINARY_DIR}/boot/bootdata/security) - add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system - ${CMAKE_BINARY_DIR}/boot/bootdata/software - ${CMAKE_BINARY_DIR}/boot/bootdata/default - ${CMAKE_BINARY_DIR}/boot/bootdata/sam - ${CMAKE_BINARY_DIR}/boot/bootdata/security - TARGET livecd_hives - DESTINATION reactos/system32/config - FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/system TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/software TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/default TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) + add_cd_file(FILE ${CMAKE_BINARY_DIR}/boot/bootdata/security TARGET livecd_hives DESTINATION reactos/system32/config FOR livecd) # BCD Hive add_custom_command( @@ -924,10 +853,13 @@ function(add_driver_inf _module) COMMAND native-utf16le "${_source_item}" "${_converted_item}" DEPENDS native-utf16le "${_source_item}") list(APPEND _converted_inf_files ${_converted_item}) + endforeach() add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files}) - add_cd_file(FILE ${_converted_inf_files} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) + foreach(item ${_converted_inf_files}) + add_cd_file(FILE ${item} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) + endforeach() endfunction() if(KDBG)

4 years, 3 months

[reactos] 01/02: [CMAKE] Use cutom commands with custom targets for generating cd targets

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1234223f417c2ea9617af… commit 1234223f417c2ea9617af0f7a1d80934861eb7d1 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sun Mar 22 09:54:24 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Sep 2 11:02:44 2020 +0200 [CMAKE] Use cutom commands with custom targets for generating cd targets This avoids rebuilding them over and over while there is nothing to do --- boot/CMakeLists.txt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 727f75a7fff..a18810d1e76 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -15,11 +15,12 @@ else() message(FATAL_ERROR "Unknown ARCH '" ${ARCH} "', cannot generate a valid UEFI boot filename.") endif() -add_custom_target(efisys +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi DEPENDS native-fatten fat bootmgfw VERBATIM) - +add_custom_target(efisys DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin) # Create an 'empty' directory (guaranteed to be empty) to be able to add # arbitrary empty directories to the ISO image using mkisofs. @@ -97,7 +98,8 @@ endfunction() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -add_custom_target(bootcd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/bootcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -106,13 +108,15 @@ add_custom_target(bootcd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(bootcd DEPENDS ${REACTOS_BINARY_DIR}/bootcd.iso) ## BootCDRegTest # Create the file list file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") -add_custom_target(bootcdregtest +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/bootcdregtest.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/bootcdregtest.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isobtrt.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -121,6 +125,7 @@ add_custom_target(bootcdregtest COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/bootcdregtest.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(bootcdregtest DEPENDS ${REACTOS_BINARY_DIR}/bootcdregtest.iso) ## LiveCD # Create the file list @@ -131,7 +136,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "${CMAKE_CURRENT_BINARY_ add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles") add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake.lst "Profiles" "Default User") -add_custom_target(livecd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -140,6 +146,7 @@ add_custom_target(livecd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/livecd.iso DEPENDS isombr native-isohybrid native-mkisofs VERBATIM) +add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso) ## HybridCD # Create the file list @@ -150,7 +157,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "${CMAKE_CURRENT_BINAR add_allusers_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles") add_user_profile_dirs(${CMAKE_CURRENT_BINARY_DIR}/hybridcd.cmake.lst "livecd/Profiles" "Default User") -add_custom_target(hybridcd +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/hybridcd.iso COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 -publisher ${ISO_MANUFACTURER} -preparer ${ISO_MANUFACTURER} -volid ${ISO_VOLNAME} -volset ${ISO_VOLNAME} -eltorito-boot loader/isoboot.bin -no-emul-boot -boot-load-size 4 -eltorito-alt-boot -eltorito-platform efi -eltorito-boot loader/efisys.bin -no-emul-boot -hide boot.catalog @@ -159,6 +167,7 @@ add_custom_target(hybridcd COMMAND native-isohybrid -b ${_isombr_file} -t 0x96 ${REACTOS_BINARY_DIR}/hybridcd.iso DEPENDS bootcd livecd VERBATIM) +add_custom_target(hybridcd DEPENDS ${REACTOS_BINARY_DIR}/hybridcd.iso) add_cd_file(TARGET efisys FILE ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR bootcd regtest livecd hybridcd)

4 years, 3 months

[reactos] 01/01: [SDK][INCLUDE] Improve EXPLORER_CMDLINE_PARSE_RESULTS structure

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2f25ebc6a2fa25cc1058… commit d2f25ebc6a2fa25cc1058481685bdb13952a928d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 2 12:47:19 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 2 12:47:19 2020 +0900 [SDK][INCLUDE] Improve EXPLORER_CMDLINE_PARSE_RESULTS structure --- sdk/include/reactos/browseui_undoc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index f90ac9ada1c..e1017bd7d97 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -106,10 +106,7 @@ typedef struct ExplorerCommandLineParseResults DWORD offset18; DWORD offset1C; LPITEMIDLIST pidlRoot; - DWORD offset24; - DWORD offset28; - DWORD offset2C; - DWORD offset30; + CLSID clsid; GUID guidInproc; } EXPLORER_CMDLINE_PARSE_RESULTS, *PEXPLORER_CMDLINE_PARSE_RESULTS;

4 years, 3 months

[reactos] 01/01: [RPCRT4] Check hBinding != 0 CORE-16936

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cc84c6db70b57a54e583… commit 1cc84c6db70b57a54e5835103939163ccd78e2a3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Sep 1 22:10:18 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Sep 1 22:10:18 2020 +0200 [RPCRT4] Check hBinding != 0 CORE-16936 To prevent logspam that was introduced when syncing to Wine Staging 4.18 in 0.4.14-dev-422-g 6feb8748d300347f848eee8436845a1f0c67d3aa Thanks for anyone helping: Doug Lyons, Fabian Maurer (Wine), Zebediah Figura (Wine) I intend to port it back into 0.4.14RC so that none of our releases will be affected. --- dll/win32/rpcrt4/ndr_stubless.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/rpcrt4/ndr_stubless.c b/dll/win32/rpcrt4/ndr_stubless.c index cc52ee27e85..47d03b13564 100644 --- a/dll/win32/rpcrt4/ndr_stubless.c +++ b/dll/win32/rpcrt4/ndr_stubless.c @@ -402,7 +402,11 @@ static void client_free_handle( pArg = ARG_FROM_OFFSET(pStubMsg->StackTop, pDesc->offset); memcpy(&pObject, pArg, pDesc->flag_and_size & 0xf); pGenPair = &pStubMsg->StubDesc->aGenericBindingRoutinePairs[pDesc->binding_routine_pair_index]; +#ifdef __REACTOS__ + if (hBinding) pGenPair->pfnUnbind(pObject, hBinding); +#else pGenPair->pfnUnbind(pObject, hBinding); +#endif break; } case FC_BIND_CONTEXT: /* explicit context */

4 years, 3 months

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 September 2020