Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 31163: Remove comment, SetEntriesInAcl is now (partly) implemented
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 22:26:28 2007 New Revision: 31163 URL: http://svn.reactos.org/svn/reactos?rev=31163&view=rev Log: Remove comment, SetEntriesInAcl is now (partly) implemented Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Tue Dec 11 22:26:28 2007 @@ -395,7 +395,6 @@ if (SetEntriesInAcl(1, &Access, NULL, &pACL) != ERROR_SUCCESS) { - // SetEntriesInAcl is not implemented yet ERR("Failed to set Access Rights for logoff thread. Logging out will most likely fail.\n"); HeapFree(GetProcessHeap(), 0, pMem);

1 0

[dchapyshev] 31162: - Update Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 22:17:03 2007 New Revision: 31162 URL: http://svn.reactos.org/svn/reactos?rev=31162&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc Tue Dec 11 22:17:03 2007 @@ -61,7 +61,7 @@ nnn Íîìåð êîäîâîé ñòðàíèöû.\n\n\ Êîìàíäà CHCP áåç ïàðàìåòðà âûâîäèò òåêóùèé íîìåð êîäîâîé ñòðàíèöû.\n" -STRING_CHOICE_HELP, "Æä¸ò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\n\ +STRING_CHOICE_HELP, "Æäåò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\n\ CHOICE [/C[:]ñïèñîê_ñèìâîëîâ][/N][/S][/T[:]c,nn][òåêñò]\n\n\ /C[:]ñïèñîê_ñèìâîëîâ Óêàçûâàåò äîïóñòèìûå ñèìâîëû. Ïî óìîë÷àíèþ ýòî YN.\n\ /N Íå âûâîäèòü ñïèñîê ñèìâîëîâ è ? ïîñëå ïîäñêàçêè.\n\ @@ -149,7 +149,7 @@ èìåíà_ôàéëîâ Èìåíà îäíîãî èëè íåñêîëüêèõ ôàéëîâ.\n\n\ /N Íåâûïîëíÿòü íåïîñðåäñòâåííî îïåðàöèþ óäàëåíèÿ ôàéëà.\n\ /P Çàïðîñ íà ïîäòâåðæäåíèå ïåðåä óäàëåíèåì êàæäîãî ôàéëà.\n\ - /T Ïîêàçûâàåò êîëè÷åñòâî óäàë¸ííûõ ôàéëîâ è îñâîáîäèâøåãîñÿ\n\ + /T Ïîêàçûâàåò êîëè÷åñòâî óäàëåííûõ ôàéëîâ è îñâîáîäèâøåãîñÿ\n\ äèñêîâîãî ïðîñòðàíñòâà.\n\ /Q Îòêëþ÷åíèå çàïðîñà íà ïîäòâåðæäåíèå ïðè óäàëåíèè ôàéëîâ.\n\ /W Ïåðåïèñàòü ôàéë ñëó÷àéíûìè äàííûìè ïåðåä óäàëåíèåì.\n\ @@ -165,7 +165,7 @@ Ïðåôèêñ ""-"" èìååò çíà÷åíèå ÍÅ\n" STRING_DEL_HELP2, "Âñå ôàéëû â êàòàëîãå áóäóò óäàëåíû!\nÂû óâåðåíû (Y/N)?" -STRING_DEL_HELP3, " %lu ôàéë óäàë¸í\n" +STRING_DEL_HELP3, " %lu ôàéë óäàëåí\n" STRING_DEL_HELP4, " %lu ôàéëîâ óäàëåíî\n" STRING_DELAY_HELP, "ïàóçà íà n ñåêóíä èëè ìèëëèñåêóíä\n\ @@ -214,7 +214,7 @@ STRING_DIR_HELP8, "%16i ôàéë(îâ)% 14s áàéò\n" STRING_DIRSTACK_HELP1, "Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ äëÿ èñïîëüçîâàíèÿ êîìàíäîé POPD, çàòåì\n\ -èçìåíÿåò å¸ íà óêàçàííóþ.\n\n\ +èçìåíÿåò åå íà óêàçàííóþ.\n\n\ PUSHD [path | ..]\n\n\ path Óêàçûâàåò äèðåêòîðèþ, êîòîðóþ íàäî ñäåëàòü òåêóùåé\n" @@ -299,7 +299,7 @@ STRING_MKDIR_HELP, "Ñîçäàíèå êàòàëîãà.\n\n\ MKDIR [äèñê:]ïóòü\nMD [äèñê:]ïóòü" -STRING_MEMMORY_HELP1, "Âûâîä îáú¸ìà ñèñòåìíîé ïàìÿòè.\n\nMEMORY" +STRING_MEMMORY_HELP1, "Âûâîä îáúåìà ñèñòåìíîé ïàìÿòè.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ %13s áàéò âñåãî ôèçè÷åñêîé ïàìÿòè.\n\ @@ -384,7 +384,7 @@ /E Íå âûâîäèòü ñîîáùåíèÿ îá îøèáêàõ.\n\ /N Nothing.\n\ /P Çàïðîñ ïîäòâåðæäåíèÿ ïåðåä ïåðåèìåíîâàíèåì.\n\ - (Not implemented yet!)\n\ + (Íå ðåàëèçîâàíî â äàííûé ìîìåíò!)\n\ /Q Quiet.\n\ /S Ïåðåèìåíîâûâàòü ïîäêàòàëîãè.\n\ /T Âûâîä êîëè÷åñòâà ïåðåèìåíîâàííûõ ôàéëîâ.\n\n\ @@ -422,7 +422,7 @@ TIME [/T][âðåìÿ]\n\n\ /T íå èçìåíÿòü âðåìÿ\n\n\ TIME áåç ïàðàìåòðîâ âûâîäèò òåêóùåå âðåìÿ è çàïðàøèâàåò\n\ -íîâîå âðåìÿ. Íàæàòèå ENTER ñîõðàíÿåò òåêóùåå âðåìÿ.\n" +íîâîå âðåìÿ. Íàæàòèå ENTER ñîõðàíèò òåêóùåå âðåìÿ.\n" STRING_TIME_HELP2, "Ââåäèòå íîâîå âðåìÿ: " @@ -520,7 +520,7 @@ CALL Âûçîâ îäíîãî ïàêåòíîãî ôàéëà èç äðóãîãî.\n\ CD Âûâîä èìåíè ëèáî ñìåíà òåêóùåãî êàòàëîãà.\n\ CHCP Âûâîä èëè ñìåíà òåêóùåãî íîìåðà êîäîâîé ñòðàíèöû.\n\ -CHOICE Æä¸ò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\ +CHOICE Æäåò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\ CLS Î÷èñòêà ýêðàíà.\n\ CMD Çàïóñê íîâîé êîïèè èíòåðïðåòàòîðà êîìàíä.\n\ COLOR Óñòàíîâêà öâåòîâ ïî óìîë÷àíèþ äëÿ òåêñòà è ôîíà.\n\ @@ -546,7 +546,7 @@ POPD Âîñòòàíàâëèâàåò ïðåäûäóùåå çíà÷åíèå òåêóùåé äèðåêòîðèè ñîõðàíåííîå êîìàíäîé\n\ PUSHD.\n\ PROMPT Èçìåíåíèå ïðèãëàøåíèÿ êîìàíäíîé ñòðîêè.\n\ -PUSHD Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ, à ïîòîì ìåíÿåò å¸.\n\ +PUSHD Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ, à ïîòîì ìåíÿåò åå.\n\ RD Óäàëåíèå êàòàëîãà.\n\ REM Çàïèñûâàåò êîììåíòàðèè (çàìå÷åíèÿ) â ïàêåòíûõ ôàéëàõ.\n\ REN Ïåðåèìåíîâàíèå îäíîãî èëè íåñêîëüêèõ ôàéëîâ èëè êàòàëîãîâ.\n\ @@ -571,7 +571,7 @@ STRING_COPY_OPTION, "YNA" -STRING_ALIAS_ERROR, "Êîìàíäíàÿ ñòðîêà ñëèøêîì äëèííàÿ ïîñëå ðàçâ¸ðòûâàíèÿ ïñåâäîíèìîâ!\n" +STRING_ALIAS_ERROR, "Êîìàíäíàÿ ñòðîêà ñëèøêîì äëèííàÿ ïîñëå ðàçâåðòûâàíèÿ ïñåâäîíèìîâ!\n" STRING_BATCH_ERROR, "Îøèáêà îòêðûòèÿ êîìàíäíîãî ôàéëà\n" STRING_CHCP_ERROR1, "Òåêóùàÿ êîäîâàÿ ñòðàíèöà: %u\n" STRING_CHCP_ERROR4, "Îøèáî÷íàÿ êîäîâàÿ ñòðàíèöà\n" @@ -590,12 +590,12 @@ STRING_COLOR_ERROR3, "Öâåò %x\n" STRING_COLOR_ERROR4, "Îäèíàêîâûå öâåòà!" STRING_CONSOLE_ERROR, "Íåèçâåñòíàÿ îøèáêà: %d\n" -STRING_COPY_ERROR1, "Îøèáêà: Íå ìîãó îòêðûòü èñòî÷íèê - %s!\n" -STRING_COPY_ERROR2, "Îøèáêà: Íå ìîãó êîïèðîâàòü â ñåáÿ!\n" +STRING_COPY_ERROR1, "Îøèáêà: Íåâîçìîæíî îòêðûòü èñòî÷íèê - %s!\n" +STRING_COPY_ERROR2, "Îøèáêà: Íåâîçìîæíî êîïèðîâàòü â ñåáÿ!\n" STRING_COPY_ERROR3, "Îøèáêà çàïèñè!\n" -STRING_COPY_ERROR4, "Îøèáêà: Not implemented yet!\n" +STRING_COPY_ERROR4, "Îøèáêà: Â äàííûé ìîìåíò íå ðåàëèçîâàíî!\n" STRING_DATE_ERROR, "Íåïðàâèëüíàÿ äàòà." -STRING_DEL_ERROR5, "Ôàéë %s áóäåò óäàë¸í! " +STRING_DEL_ERROR5, "Ôàéë %s áóäåò óäàëåí! " STRING_DEL_ERROR6, "Âû óâåðåíû (Y/N)?" STRING_DEL_ERROR7, "Óäàëåíèå: %s\n" STRING_ERROR_ERROR1, "Íåèçâåñòíàÿ îøèáêà! Êîä îøèáêè: 0x%lx\n" @@ -605,7 +605,7 @@ STRING_FOR_ERROR3, "'do' îòñóòñâóåò." STRING_FOR_ERROR4, "íåò êîìàíäû ïîñëå 'do'." STRING_FREE_ERROR1, "Íåïðàâèëüíîå èìÿ äèñêà" -STRING_FREE_ERROR2, "unlabeled" +STRING_FREE_ERROR2, "íåîòìå÷åíî" STRING_GOTO_ERROR1, "Íå îïðåäåëåíà ìåòêà äëÿ GOTO" STRING_GOTO_ERROR2, "Ìåòêà '%s' íå íàéäåíà\n" @@ -624,14 +624,14 @@ STRING_ERROR_PARAMETERF_ERROR, "Íåêîððåêòíûé ôîðìàò ïàðàìåòðà - %c\n" -STRING_ERROR_INVALID_SWITCH, "Íåâåðíûàÿ îïöèÿ - /%c\n" +STRING_ERROR_INVALID_SWITCH, "Íåâåðíûé ïàðàìåòð - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Ñëèøêîì ìíîãî ïàðàìåòðîâ - %s\n" STRING_ERROR_PATH_NOT_FOUND, "Ïóòü íå íàéäåí\n" STRING_ERROR_FILE_NOT_FOUND, "Ôàéë íå íàéäåí\n" STRING_ERROR_REQ_PARAM_MISSING, "Îòñóòñòâóåò íåîáõîäèìûé ïàðàìåòð\n" STRING_ERROR_INVALID_DRIVE, "Îøèáî÷íîå îïðåäåëåíèå äèñêà\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Îøèáî÷íûé ôîðìàò ïàðàìåòðà - %s\n" -STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè èìÿ ôàéëà\n" +STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà\n" STRING_ERROR_OUT_OF_MEMORY, "Íåõâàòêà ïàìÿòè.\n" STRING_ERROR_CANNOTPIPE, "Îøèáêà! Íåâîçìîæíî èñïîëüçîâàòü pipe! Íåâîçìîæíî ñîçäàòü âðåìåííûé ôàéë!\n" STRING_ERROR_D_PAUSEMSG, "Äëÿ ïðîäîëæåíèÿ íàæìèòå ëþáóþ êëàâèøó . . ." @@ -639,7 +639,7 @@ STRING_PATH_ERROR, "CMD: Íå â ñðåäå îêðóæåíèÿ '%s'\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS" STRING_VERSION_RUNVER, " çàïóùåí íà %s" STRING_COPY_FILE , " %d ôàéë(îâ) ñêîïèðîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -651,6 +651,6 @@ STRING_INVALID_OPERAND, "Íåâåðíûé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Îæèäàåòñÿ ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Îæèäàåòñÿ ÷èñëî èëè íàçâàíèå ïåðåìåííîé." -STRING_SYNTAX_COMMAND_INCORRECT, "Íåêîððåêòíûé ñèíòàêñèñ êîìàíäû." +STRING_SYNTAX_COMMAND_INCORRECT, "Íåâåðíûé ñèíòàêñèñ êîìàíäû." }

1 0

[weiden] 31161: Fix a memory leak in AccpLookupSidByName
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 21:56:55 2007 New Revision: 31161 URL: http://svn.reactos.org/svn/reactos?rev=31161&view=rev Log: Fix a memory leak in AccpLookupSidByName Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 21:56:55 2007 @@ -366,7 +366,10 @@ return LsaNtStatusToWinError(Status); if (TranslatedSid->Use == SidTypeUnknown || TranslatedSid->Use == SidTypeInvalid) - return LsaNtStatusToWinError(STATUS_NONE_MAPPED); /* FIXME- what error code? */ + { + Ret = LsaNtStatusToWinError(STATUS_NONE_MAPPED); /* FIXME- what error code? */ + goto Cleanup; + } SidLen = GetLengthSid(TranslatedSid->Sid); ASSERT(SidLen != 0); @@ -387,6 +390,7 @@ else Ret = ERROR_NOT_ENOUGH_MEMORY; +Cleanup: LsaFreeMemory(ReferencedDomains); LsaFreeMemory(TranslatedSid);

1 0

[weiden] 31160: Implement looking up a named trustee's sid
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 21:54:23 2007 New Revision: 31160 URL: http://svn.reactos.org/svn/reactos?rev=31160&view=rev Log: Implement looking up a named trustee's sid Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c trunk/reactos/dll/win32/ntmarta/ntmarta.h Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 21:54:23 2007 @@ -292,6 +292,167 @@ return ObjectType; } +static DWORD +AccpOpenLSAPolicyHandle(IN LPWSTR SystemName, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE pPolicyHandle) +{ + LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0}; + LSA_UNICODE_STRING LsaSystemName, *psn; + NTSTATUS Status; + + if (SystemName != NULL && SystemName[0] != L'\0') + { + LsaSystemName.Buffer = SystemName; + LsaSystemName.Length = wcslen(SystemName) * sizeof(WCHAR); + LsaSystemName.MaximumLength = LsaSystemName.Length + sizeof(WCHAR); + psn = &LsaSystemName; + } + else + { + psn = NULL; + } + + Status = LsaOpenPolicy(psn, + &LsaObjectAttributes, + DesiredAccess, + pPolicyHandle); + if (!NT_SUCCESS(Status)) + return LsaNtStatusToWinError(Status); + + return ERROR_SUCCESS; +} + +static LPWSTR +AccpGetTrusteeName(IN PTRUSTEE_W Trustee) +{ + switch (Trustee->TrusteeForm) + { + case TRUSTEE_IS_NAME: + return Trustee->ptstrName; + + case TRUSTEE_IS_OBJECTS_AND_NAME: + return ((POBJECTS_AND_NAME_W)Trustee->ptstrName)->ptstrName; + + default: + return NULL; + } +} + +static DWORD +AccpLookupSidByName(IN LSA_HANDLE PolicyHandle, + IN LPWSTR Name, + OUT PSID *pSid) +{ + NTSTATUS Status; + LSA_UNICODE_STRING LsaNames[1]; + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomains = NULL; + PLSA_TRANSLATED_SID2 TranslatedSid = NULL; + DWORD SidLen; + DWORD Ret = ERROR_SUCCESS; + + LsaNames[0].Buffer = Name; + LsaNames[0].Length = wcslen(Name) * sizeof(WCHAR); + LsaNames[0].MaximumLength = LsaNames[0].Length + sizeof(WCHAR); + + Status = LsaLookupNames2(PolicyHandle, + 0, + sizeof(LsaNames) / sizeof(LsaNames[0]), + LsaNames, + &ReferencedDomains, + &TranslatedSid); + + if (!NT_SUCCESS(Status)) + return LsaNtStatusToWinError(Status); + + if (TranslatedSid->Use == SidTypeUnknown || TranslatedSid->Use == SidTypeInvalid) + return LsaNtStatusToWinError(STATUS_NONE_MAPPED); /* FIXME- what error code? */ + + SidLen = GetLengthSid(TranslatedSid->Sid); + ASSERT(SidLen != 0); + + *pSid = LocalAlloc(LMEM_FIXED, (SIZE_T)SidLen); + if (*pSid != NULL) + { + if (!CopySid(SidLen, + *pSid, + TranslatedSid->Sid)) + { + Ret = GetLastError(); + + LocalFree((HLOCAL)*pSid); + *pSid = NULL; + } + } + else + Ret = ERROR_NOT_ENOUGH_MEMORY; + + LsaFreeMemory(ReferencedDomains); + LsaFreeMemory(TranslatedSid); + + return Ret; +} + + +static DWORD +AccpGetTrusteeSid(IN PTRUSTEE_W Trustee, + IN OUT PLSA_HANDLE pPolicyHandle, + OUT PSID *ppSid, + OUT BOOL *Allocated) +{ + DWORD Ret = ERROR_SUCCESS; + + *ppSid = NULL; + *Allocated = FALSE; + + if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) + { + DPRINT1("Trustee form not supported\n"); + return ERROR_INVALID_PARAMETER; + } + + switch (Trustee->TrusteeForm) + { + case TRUSTEE_IS_NAME: + case TRUSTEE_IS_OBJECTS_AND_NAME: + if (*pPolicyHandle == NULL) + { + Ret = AccpOpenLSAPolicyHandle(NULL, /* FIXME - always local? */ + POLICY_LOOKUP_NAMES, + pPolicyHandle); + if (Ret != ERROR_SUCCESS) + return Ret; + + ASSERT(*pPolicyHandle != NULL); + } + + Ret = AccpLookupSidByName(*pPolicyHandle, + AccpGetTrusteeName(Trustee), + ppSid); + if (Ret == ERROR_SUCCESS) + { + ASSERT(*ppSid != NULL); + *Allocated = TRUE; + } + break; + + case TRUSTEE_IS_OBJECTS_AND_SID: + *ppSid = ((POBJECTS_AND_SID)Trustee->ptstrName)->pSid; + break; + + case TRUSTEE_IS_SID: + *ppSid = (PSID)Trustee->ptstrName; + break; + + default: + DPRINT1("Wrong Trustee form\n"); + Ret = ERROR_INVALID_PARAMETER; + break; + } + + return Ret; +} + /********************************************************************** * AccRewriteGetHandleRights EXPORTED @@ -975,37 +1136,6 @@ } -static PSID -GetTrusteeSid(PTRUSTEE Trustee, - BOOL *Allocated) -{ - if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) - { - DPRINT1("Trustee form not supported\n"); - return NULL; - } - - switch (Trustee->TrusteeForm) - { - case TRUSTEE_IS_NAME: - case TRUSTEE_IS_OBJECTS_AND_NAME: - /* FIXME */ - DPRINT1("Case not implemented\n"); - ASSERT(FALSE); - return NULL; - case TRUSTEE_IS_OBJECTS_AND_SID: - *Allocated = FALSE; - return ((POBJECTS_AND_SID)Trustee->ptstrName)->pSid; - case TRUSTEE_IS_SID: - *Allocated = FALSE; - return (PSID)Trustee->ptstrName; - default: - DPRINT1("Wrong Trustee form\n"); - return NULL; - } -} - - /********************************************************************** * AccRewriteSetEntriesInAcl EXPORTED * @@ -1017,13 +1147,14 @@ PACL OldAcl, PACL* NewAcl) { - PACL pNew; + PACL pNew = NULL; ACL_SIZE_INFORMATION SizeInformation; PACE_HEADER pAce; BOOLEAN *pKeepAce = NULL; BOOL needToClean; PSID pSid1, pSid2; ULONG i; + LSA_HANDLE PolicyHandle = NULL; BOOL bRet; DWORD LastErr; DWORD Ret = ERROR_SUCCESS; @@ -1060,12 +1191,18 @@ /* Get size required for new entries */ for (i = 0; i < cCountOfExplicitEntries; i++) { + Ret = AccpGetTrusteeSid(&pListOfExplicitEntries[i].Trustee, + &PolicyHandle, + &pSid1, + &needToClean); + if (Ret != ERROR_SUCCESS) + goto Cleanup; + switch (pListOfExplicitEntries[i].grfAccessMode) { case REVOKE_ACCESS: case SET_ACCESS: /* Discard all accesses for the trustee... */ - pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); for (i = 0; i < SizeInformation.AceCount; i++) { if (!pKeepAce[i]) @@ -1083,21 +1220,16 @@ SizeInformation.AclBytesInUse -= pAce->AceSize; } } - if (needToClean) LocalFree((HLOCAL)pSid1); if (pListOfExplicitEntries[i].grfAccessMode == REVOKE_ACCESS) break; /* ...and replace by the current access */ case GRANT_ACCESS: /* Add to ACL */ - pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(pSid1); - if (needToClean) LocalFree((HLOCAL)pSid1); break; case DENY_ACCESS: /* Add to ACL */ - pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + RtlLengthSid(pSid1); - if (needToClean) LocalFree((HLOCAL)pSid1); break; case SET_AUDIT_SUCCESS: case SET_AUDIT_FAILURE: @@ -1108,6 +1240,9 @@ DPRINT1("Unknown access mode 0x%x. Ignoring it\n", pListOfExplicitEntries[i].grfAccessMode); break; } + + if (needToClean) + LocalFree((HLOCAL)pSid1); } /* OK, now create the new ACL */ @@ -1137,7 +1272,13 @@ if (pListOfExplicitEntries[i].grfAccessMode == DENY_ACCESS) { /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ - pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + Ret = AccpGetTrusteeSid(&pListOfExplicitEntries[i].Trustee, + &PolicyHandle, + &pSid1, + &needToClean); + if (Ret != ERROR_SUCCESS) + goto Cleanup; + bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) @@ -1158,7 +1299,13 @@ pListOfExplicitEntries[i].grfAccessMode == GRANT_ACCESS) { /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ - pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + Ret = AccpGetTrusteeSid(&pListOfExplicitEntries[i].Trustee, + &PolicyHandle, + &pSid1, + &needToClean); + if (Ret != ERROR_SUCCESS) + goto Cleanup; + bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); if (needToClean) LocalFree((HLOCAL)pSid1); if (!bRet) @@ -1177,6 +1324,12 @@ Cleanup: if (pKeepAce) LocalFree((HLOCAL)pKeepAce); + + if (pNew && Ret != ERROR_SUCCESS) + LocalFree((HLOCAL)pNew); + + if (PolicyHandle) + LsaClose(PolicyHandle); /* restore the last error code */ SetLastError(LastErr); Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.h (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.h Tue Dec 11 21:54:23 2007 @@ -5,6 +5,7 @@ #include <accctrl.h> #include <aclapi.h> #include <winsvc.h> +#include <ntsecapi.h> #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS

1 0

[fireball] 31159: - A message about LdrGetExportByName() is not critical, so downgrade it from DPRINT1 to DPRINT.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 21:48:52 2007 New Revision: 31159 URL: http://svn.reactos.org/svn/reactos?rev=31159&view=rev Log: - A message about LdrGetExportByName() is not critical, so downgrade it from DPRINT1 to DPRINT. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Tue Dec 11 21:48:52 2007 @@ -1195,7 +1195,7 @@ } } - DPRINT1("LdrGetExportByName(): failed to find %s\n",SymbolName); + DPRINT("LdrGetExportByName(): failed to find %s\n",SymbolName); return (PVOID)NULL; }

1 0

[fireball] 31158: - Silence non-critical debug output.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 21:31:13 2007 New Revision: 31158 URL: http://svn.reactos.org/svn/reactos?rev=31158&view=rev Log: - Silence non-critical debug output. Modified: trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Tue Dec 11 21:31:13 2007 @@ -1158,7 +1158,7 @@ // then fix up the partition list to make it look like there is one // zero length partition. // - DPRINT1("IoReadPartitionTable() status: 0x%08X\n", status); + DPRINT("IoReadPartitionTable() status: 0x%08X\n", status); if ((!NT_SUCCESS(status) || partitionList->PartitionCount == 0) && PhysicalDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Tue Dec 11 21:31:13 2007 @@ -1098,7 +1098,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("SpiCreatePortConfig() failed with Status 0x%08X\n", Status); + DPRINT("SpiCreatePortConfig() failed with Status 0x%08X\n", Status); break; }

1 0

[weiden] 31157: Fix a buffer overflow accessing the pKeepAce array in AccRewriteSetEntriesInAcl
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 20:52:30 2007 New Revision: 31157 URL: http://svn.reactos.org/svn/reactos?rev=31157&view=rev Log: Fix a buffer overflow accessing the pKeepAce array in AccRewriteSetEntriesInAcl Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 20:52:30 2007 @@ -1020,7 +1020,7 @@ PACL pNew; ACL_SIZE_INFORMATION SizeInformation; PACE_HEADER pAce; - BOOL *pKeepAce = NULL; + BOOLEAN *pKeepAce = NULL; BOOL needToClean; PSID pSid1, pSid2; ULONG i; @@ -1042,14 +1042,14 @@ goto Cleanup; } - pKeepAce = (BOOL *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount); + pKeepAce = (BOOLEAN *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount * sizeof(*pKeepAce)); if (!pKeepAce) { Ret = ERROR_NOT_ENOUGH_MEMORY; goto Cleanup; } - memset(pKeepAce, TRUE, SizeInformation.AceCount); + memset(pKeepAce, TRUE, SizeInformation.AceCount * sizeof(*pKeepAce)); } else {

1 0

[weiden] 31156: Correctly preserve and restore last error code in AccRewriteSetEntriesInAcl
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 20:49:49 2007 New Revision: 31156 URL: http://svn.reactos.org/svn/reactos?rev=31156&view=rev Log: Correctly preserve and restore last error code in AccRewriteSetEntriesInAcl Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 20:49:49 2007 @@ -1024,8 +1024,12 @@ BOOL needToClean; PSID pSid1, pSid2; ULONG i; - LONG rc; - BOOL ret; + BOOL bRet; + DWORD LastErr; + DWORD Ret = ERROR_SUCCESS; + + /* save the last error code */ + LastErr = GetLastError(); *NewAcl = NULL; @@ -1033,10 +1037,18 @@ if (OldAcl) { if (!GetAclInformation(OldAcl, &SizeInformation, sizeof(ACL_SIZE_INFORMATION), AclSizeInformation)) - return GetLastError(); + { + Ret = GetLastError(); + goto Cleanup; + } + pKeepAce = (BOOL *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount); if (!pKeepAce) - return ERROR_NOT_ENOUGH_MEMORY; + { + Ret = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + memset(pKeepAce, TRUE, SizeInformation.AceCount); } else @@ -1059,7 +1071,11 @@ if (!pKeepAce[i]) continue; if (!GetAce(OldAcl, i, (PVOID*)&pAce)) - goto cleanup; + { + Ret = GetLastError(); + goto Cleanup; + } + pSid2 = AccpGetAceSid(pAce); if (RtlEqualSid(pSid1, pSid2)) { @@ -1099,11 +1115,14 @@ pNew = (PACL)LocalAlloc(LMEM_FIXED, SizeInformation.AclBytesInUse); if (!pNew) { - rc = ERROR_NOT_ENOUGH_MEMORY; - goto done; + Ret = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } if (!InitializeAcl(pNew, SizeInformation.AclBytesInUse, ACL_REVISION)) - goto cleanup; + { + Ret = GetLastError(); + goto Cleanup; + } /* Fill it */ /* 1a) New audit entries (SET_AUDIT_SUCCESS, SET_AUDIT_FAILURE) */ @@ -1119,10 +1138,13 @@ { /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); - ret = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); if (needToClean) LocalFree((HLOCAL)pSid1); - if (!ret) - goto cleanup; + if (!bRet) + { + Ret = GetLastError(); + goto Cleanup; + } } } @@ -1137,10 +1159,13 @@ { /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); - ret = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); if (needToClean) LocalFree((HLOCAL)pSid1); - if (!ret) - goto cleanup; + if (!bRet) + { + Ret = GetLastError(); + goto Cleanup; + } } } @@ -1148,17 +1173,15 @@ /* FIXME */ *NewAcl = pNew; - rc = ERROR_SUCCESS; - goto done; - -cleanup: - rc = GetLastError(); - -done: + +Cleanup: if (pKeepAce) LocalFree((HLOCAL)pKeepAce); - DPRINT("Returning %d\n", rc); - return rc; + + /* restore the last error code */ + SetLastError(LastErr); + + return Ret; }

1 0

[weiden] 31155: Replace GetOwner helper function with the already existing AccpGetAceSid function and enhance it to also support SYSTEM_MANDATORY_LABEL_ACE_TYPE
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 20:22:34 2007 New Revision: 31155 URL: http://svn.reactos.org/svn/reactos?rev=31155&view=rev Log: Replace GetOwner helper function with the already existing AccpGetAceSid function and enhance it to also support SYSTEM_MANDATORY_LABEL_ACE_TYPE Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 20:22:34 2007 @@ -140,6 +140,11 @@ Size += sizeof(Ace->InheritedObjectType); break; } + + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + Size = FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, + SidStart); + break; } return Size; @@ -1000,24 +1005,6 @@ } } -static PSID -GetOwner(PACE_HEADER Ace) -{ - switch (Ace->AceType) - { - case ACCESS_ALLOWED_ACE_TYPE: - return (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart; - case ACCESS_DENIED_ACE_TYPE: - return (PSID)&((PACCESS_DENIED_ACE)Ace)->SidStart; - case SYSTEM_AUDIT_ACE_TYPE: - return (PSID)&((PSYSTEM_AUDIT_ACE)Ace)->SidStart; - case SYSTEM_MANDATORY_LABEL_ACE_TYPE: - return (PSID)&((PSYSTEM_MANDATORY_LABEL_ACE)Ace)->SidStart; - default: - DPRINT1("Unknown ACE type 0x%x\n", Ace->AceType); - return NULL; - } -} /********************************************************************** * AccRewriteSetEntriesInAcl EXPORTED @@ -1073,7 +1060,7 @@ continue; if (!GetAce(OldAcl, i, (PVOID*)&pAce)) goto cleanup; - pSid2 = GetOwner(pAce); + pSid2 = AccpGetAceSid(pAce); if (RtlEqualSid(pSid1, pSid2)) { pKeepAce[i] = FALSE;

1 0

[mpiulachs] 31154: * Introduced a new element "PlatformLanguage" to build and include only part of the resource localizations available on languages.rbuild * removed NTOSKRNL_SHARED and move it back to the mingw backend, no reason to be a property * cleanup obsolete code * create more correct auto-generated include/manifest files
by mpiulachs＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: mpiulachs Date: Tue Dec 11 20:09:34 2007 New Revision: 31154 URL: http://svn.reactos.org/svn/reactos?rev=31154&view=rev Log: * Introduced a new element "PlatformLanguage" to build and include only part of the resource localizations available on languages.rbuild * removed NTOSKRNL_SHARED and move it back to the mingw backend, no reason to be a property * cleanup obsolete code * create more correct auto-generated include/manifest files Modified: branches/rbuild/reactos/ReactOS-generic.rbuild branches/rbuild/reactos/ReactOS-i386.rbuild branches/rbuild/reactos/dll/cpl/desk/desk.rbuild branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/bootstrap.cpp branches/rbuild/reactos/tools/rbuild/cdfile.cpp branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp branches/rbuild/reactos/tools/rbuild/module.cpp branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/rbuild/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-generic.… ============================================================================== --- branches/rbuild/reactos/ReactOS-generic.rbuild (original) +++ branches/rbuild/reactos/ReactOS-generic.rbuild Tue Dec 11 20:09:34 2007 @@ -70,4 +70,9 @@ <xi:include href="subsystems/subsystems.rbuild" /> </directory> +  + <platformlanguage isoname="en-US" /> + <platformlanguage isoname="es-ES" /> + <platformlanguage isoname="de-DE" /> + </group> Modified: branches/rbuild/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/ReactOS-i386.rbu… ============================================================================== --- branches/rbuild/reactos/ReactOS-i386.rbuild (original) +++ branches/rbuild/reactos/ReactOS-i386.rbuild Tue Dec 11 20:09:34 2007 @@ -8,8 +8,6 @@ </xi:include> <xi:include href="ReactOS-generic.rbuild" /> - - <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> <if property="GDB" value="0"> <if property="OPTIMIZE" value="1"> @@ -40,4 +38,9 @@ <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> + + <overridemodule name="ntoskrnl" allowwarnings="true"> + <define name="SILLY_DEFINE" /> + </overridemodule> + </project> Modified: branches/rbuild/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/dll/cpl/desk/des… ============================================================================== --- branches/rbuild/reactos/dll/cpl/desk/desk.rbuild (original) +++ branches/rbuild/reactos/dll/cpl/desk/desk.rbuild Tue Dec 11 20:09:34 2007 @@ -46,6 +46,7 @@ <metadata description="ReactOS Display ControlPanel Applet" /> +  <localization isoname="bg-BG">lang/bg-BG.rc</localization> <localization isoname="cs-CZ">lang/cs-CZ.rc</localization> <localization isoname="de-DE">lang/de-DE.rc</localization> Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Dec 11 20:09:34 2007 @@ -2612,7 +2612,7 @@ module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, "${gcc}", - linkerParameters + " $(NTOSKRNL_SHARED)", + linkerParameters + " -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", objectsMacro, libsMacro, "-sections" ); Modified: branches/rbuild/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/boo… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/bootstrap.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/bootstrap.cpp Tue Dec 11 20:09:34 2007 @@ -17,7 +17,6 @@ */ #include "pch.h" #include <assert.h> - #include "rbuild.h" using std::string; @@ -75,18 +74,6 @@ __LINE__ ); } -//string -//Bootstrap::ReplaceVariable ( const string& name, -// const string& value, -// string path ) -//{ -// size_t i = path.find ( name ); -// if ( i != string::npos ) -// return path.replace ( i, name.length (), value ); -// else -// return path; -//} - void Bootstrap::Initialize () { Modified: branches/rbuild/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cdf… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/cdfile.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/cdfile.cpp Tue Dec 11 20:09:34 2007 @@ -17,34 +17,10 @@ */ #include "pch.h" #include <assert.h> - #include "rbuild.h" using std::string; -//string -//CDFile::ReplaceVariable ( const string& name, -// const string& value, -// string path ) -//{ -// size_t i = path.find ( name ); -// if ( i != string::npos ) -// return path.replace ( i, name.length (), value ); -// else -// return path; -//} -// -//string -//BootstrapFile::ReplaceVariable ( const string& name, -// const string& value, -// string path ) -//{ -// size_t i = path.find ( name ); -// if ( i != string::npos ) -// return path.replace ( i, name.length (), value ); -// else -// return path; -//} CDFile::CDFile ( const Project& project, const XMLElement& cdfileNode, Modified: branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp Tue Dec 11 20:09:34 2007 @@ -103,6 +103,10 @@ s = buf; s = s + sprintf ( s, "/* Auto generated */\n"); + s = s + sprintf ( s, "/* Edit contributors.rbuild to add or remove developers */\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#ifndef __INCLUDE_AUTOCONTRIBUTORS_H\n" ); + s = s + sprintf ( s, "#define __INCLUDE_AUTOCONTRIBUTORS_H\n" ); s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "const char* szAutoContributors[]= \n" ); s = s + sprintf ( s, "{\n" ); @@ -118,6 +122,8 @@ s = s + sprintf ( s, "\t0\n"); s = s + sprintf ( s, "};\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#endif /* __INCLUDE_AUTOCONTRIBUTORS_H */\n" ); FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "autocontributors.h" ) ); Modified: branches/rbuild/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/module.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/module.cpp Tue Dec 11 20:09:34 2007 @@ -1674,6 +1674,28 @@ { } +PlatformLanguage::PlatformLanguage ( const Project& _project , const XMLElement& _node) + : project(_project) , node (_node) +{ + const XMLAttribute* att = node.GetAttribute ( "isoname", true ); + assert(att); + isoname = att->value; + + const Language* language = project.LocateLanguage ( isoname ); + if ( language == NULL ) + { + throw XMLInvalidBuildFileException ( + node.location, + "<PlatformLanguage> references a no existant language '%s'", + isoname.c_str() ); + } +} + +void +PlatformLanguage::ProcessXML() +{ +} + Family::Family ( const XMLElement& _node, const Module& _module ) : node (_node), Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Tue Dec 11 20:09:34 2007 @@ -60,7 +60,7 @@ s = s + sprintf ( s, " <assemblyIdentity"); s = s + sprintf ( s, " version=\"1.0.0.0\""); s = s + sprintf ( s, " processorArchitecture=\"x86\""); - s = s + sprintf ( s, " name=\"ReactOS.System.ControlPanel.System\""); + s = s + sprintf ( s, " name=\"ReactOS.System.Module\""); s = s + sprintf ( s, " type=\"win32\""); s = s + sprintf ( s, " />"); Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Tue Dec 11 20:09:34 2007 @@ -84,14 +84,20 @@ s = s + sprintf ( s, "\n" ); } + /* Include resources for module localizations */ for ( size_t i = 0; i < module.localizations.size (); i++ ) { Localization& localization = *module.localizations[i]; - std::string langFile = NormalizeFilename(localization.file.relative_path + sSep + localization.file.name); + /* If this locale is included in our platform ... */ + const PlatformLanguage* platformLanguage = module.project.LocatePlatformLanguage (localization.isoname); + if (platformLanguage != NULL) + { + std::string langFile = NormalizeFilename(localization.file.relative_path + sSep + localization.file.name); - s = s + sprintf ( s, "#include \"%s\"" , langFile.c_str() ); - s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#include \"%s\"" , langFile.c_str() ); + s = s + sprintf ( s, "\n" ); + } } FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep + "auto.rc" ) ); Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Tue Dec 11 20:09:34 2007 @@ -524,6 +524,12 @@ languages.push_back ( language ); subs_invalid = false; } + else if ( e.name == "platformlanguage" ) + { + PlatformLanguage* platformLanguage = new PlatformLanguage ( *this, e ); + platformLanguages.push_back ( platformLanguage ); + subs_invalid = false; + } else if ( e.name == "contributor" ) { Contributor* contributor = new Contributor ( e ); @@ -669,6 +675,30 @@ return NULL; } +const Language* +Project::LocateLanguage ( const std::string& name ) const +{ + for ( size_t i = 0; i < languages.size (); i++ ) + { + if ( languages[i]->isoname == name ) + return languages[i]; + } + + return NULL; +} + +const PlatformLanguage* +Project::LocatePlatformLanguage ( const std::string& name ) const +{ + for ( size_t i = 0; i < platformLanguages.size (); i++ ) + { + if ( platformLanguages[i]->isoname == name ) + return platformLanguages[i]; + } + + return NULL; +} + const std::string& Project::GetProjectFilename () const { Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Tue Dec 11 20:09:34 2007 @@ -122,6 +122,7 @@ class BaseAdress; class BuildFamily; class Family; +class PlatformLanguage; typedef std::map<std::string,Directory*> directory_map; @@ -276,6 +277,7 @@ std::vector<BuildFamily*> buildfamilies; std::vector<Module*> modules; std::vector<Language*> languages; + std::vector<PlatformLanguage*> platformLanguages; std::vector<Contributor*> contributors; std::vector<InstallFolder*> installFolders; IfableData non_if_data; @@ -292,6 +294,8 @@ ArchitectureType architectureType; void ProcessXML ( const std::string& path ); Module* LocateModule ( const std::string& name ); + const Language* LocateLanguage ( const std::string& name ) const; + const PlatformLanguage* LocatePlatformLanguage ( const std::string& name ) const; const BuildFamily* LocateFamily ( const std::string& name ) const; const Contributor* LocateContributor ( const std::string& alias ) const; const Module* LocateModule ( const std::string& name ) const; @@ -691,6 +695,19 @@ void ProcessXML (); }; +class PlatformLanguage +{ +public: + const Project& project; + const XMLElement& node; + std::string isoname; + + PlatformLanguage ( const Project& _project, + const XMLElement& _node ); + + void ProcessXML (); +}; + class Contributor { public:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs