Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20813: implemented WaitForUserPolicyForegroundProcessing() and WaitForMachinePolicyForegroundProcessing()

by weiden＠svn.reactos.org

implemented WaitForUserPolicyForegroundProcessing() and WaitForMachinePolicyForegroundProcessing() Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:31:08 UTC (rev 20812) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 20:32:44 UTC (rev 20813) @@ -47,10 +47,12 @@ static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; static const WCHAR szLocalGPRefreshEvent[] = L"userenv: user policy refresh event"; static const WCHAR szLocalGPForceRefreshEvent[] = L"userenv: user policy force refresh event"; +static const WCHAR szLocalGPDoneEvent[] = L"userenv: User Policy Foreground Done Event"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; static const WCHAR szMachineGPRefreshEvent[] = L"Global\\userenv: machine policy refresh event"; static const WCHAR szMachineGPForceRefreshEvent[] = L"Global\\userenv: machine policy force refresh event"; +static const WCHAR szMachineGPDoneEvent[] = L"Global\\userenv: Machine Policy Foreground Done Event"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -521,3 +523,43 @@ return Ret; } + +BOOL WINAPI +WaitForUserPolicyForegroundProcessing(VOID) +{ + HANDLE hEvent; + BOOL Ret = FALSE; + + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + szLocalGPDoneEvent); + if (hEvent != NULL) + { + Ret = WaitForSingleObject(hEvent, + INFINITE) != WAIT_FAILED; + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} + +BOOL WINAPI +WaitForMachinePolicyForegroundProcessing(VOID) +{ + HANDLE hEvent; + BOOL Ret = FALSE; + + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + szMachineGPDoneEvent); + if (hEvent != NULL) + { + Ret = WaitForSingleObject(hEvent, + INFINITE) != WAIT_FAILED; + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 20:31:08 UTC (rev 20812) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 20:32:44 UTC (rev 20813) @@ -38,4 +38,6 @@ RegisterGPNotification@8 UnloadUserProfile@8 UnregisterGPNotification@4 +WaitForUserPolicyForegroundProcessing@0 +WaitForMachinePolicyForegroundProcessing@0 ;EOF

18 years, 8 months

[cwittich] 20812: added Ukranian translations by temarez <temarez@yandex.ru> (fixed bug 1269)

by cwittich＠svn.reactos.org

added Ukranian translations by temarez <temarez(a)yandex.ru> (fixed bug 1269) Added: trunk/reactos/subsys/system/calc/Uk.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc Added: trunk/reactos/subsys/system/winlogon/Uk.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/calc/Uk.rc --- trunk/reactos/subsys/system/calc/Uk.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/calc/Uk.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -0,0 +1,155 @@ +/* + * WineCalc (Uk.rc) + * + * Copyright 2006 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "?ÓÙ³Û¾Ù ?¯" + + IDS_COPYRIGHT1, "?ÓÙ³Û¾Ù ?¯ 5.0. ??÷ÕÝþ¯ÔÓÝ¯ ´?õ LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "ÐÓÝ-i¯±Õ, ?ÓÙ?¶¯Ý? , ÐÏ?" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "?Õ´ÓÔÞÙ³ÝÞÚ ÓÒ¾ýÕÝ? ¶¾ÝÛ÷??." + IDS_ERR_DIVIDE_BY_ZERO, "??ÙÞ?Þ ÝÓ Ý¾Ù³ ÝÕ ý¯µÝÓ." + IDS_ERR_UNDEFINED, "ðÕþ¾Ù³?Ó? ¶¾ÝÛ÷?? ÝÕÔÞþÝÓ¸ÕÝÞÚ." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "About Calculator", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ï?±?ÝÓõ÷ ?Û¯ÔÞÚ (Hex)\tF5", ID_CALC_NS_HEX + MENUITEM "?Õ± ?Û¯ÔÞÚ (Dec)\tF6", ID_CALC_NS_DEC + MENUITEM "??±?ýÛ¯ÔÞÚ (Oct)\tF7", ID_CALC_NS_OCT + MENUITEM "?Ô?ÚÛ¯ÔÞÚ (Bin)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "?Óõ¾±Þ\tF2", ID_CALC_MS_DEGREES + MENUITEM "ðÓõ?ÓÝÞ\tF3", ID_CALC_MS_RADIANS + MENUITEM "?ÓõÞ\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¤¯ ?ÓÙ³Û¾Ù ?¯", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&¤ÓÔÛÓ" { + MENUITEM "&?¯´??ÔÓ?Þ Ctrl+C", IDM_COPY + MENUITEM "?±?&ÓÔÞ?Þ Ctrl+V", IDM_PASTE + } + POPUP "&?ÞÒÙ õ" { + MENUITEM "ÃÔÞ¸ÓÚÝÞÚ", IDM_MODE_STANDARD + MENUITEM "?ÝµÕÝÕÝÞÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ï?±?ÝÓõ÷ ?Û¯ÔÞÚ (Hex)\tF5", ID_CALC_NS_HEX + MENUITEM "?Õ± ?Û¯ÔÞÚ (Dec)\tF6", ID_CALC_NS_DEC + MENUITEM "??±?ýÛ¯ÔÞÚ (Oct)\tF7", ID_CALC_NS_OCT + MENUITEM "?Ô?ÚÛ¯ÔÞÚ (Bin)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "??Ù³Û?±?³ ÷Þ¶ ¾ Ò¾´?", IDM_DIGIT_GROUPING + } + POPUP "&?¯Ô?õÛÓ" { + MENUITEM "Ãý?±?", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¤¯ ?ÓÙ³Û¾Ù ?¯", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "¤¯ GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "?¯ ÷Õ?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Property changes on: trunk/reactos/subsys/system/calc/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -33,5 +33,6 @@ #include "Ru.rc" #include "Sv.rc" #include "Hu.rc" +#include "Uk.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL _____ Added: trunk/reactos/subsys/system/winlogon/Uk.rc --- trunk/reactos/subsys/system/winlogon/Uk.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/winlogon/Uk.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -0,0 +1,45 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÃÓÔÕ°ÕÝÝ ¯ß¯?Þ þ Û¯ý´'??Õ¯ý" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÊÕ´Õ ý¯µÝÓ ÔÞýÛÝ¾?Þ Û¯ý´'??Õ.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&¤ÕÕþÓÔÓÝ?ÓµÕÝÝ ", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¤¯ýÞÙÛÓ ?Ý?Õ¶ÕÚ±¾ Û¯Þ±?¾ÔÓ¸Ó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "?Õ ÔõÓÙ¯± þÓÔÓÝ?ÓµÞ?Þ ß?ßÙ?¯?ÕÛ¾ ?Ý?Õ¶ÕÚ±¾ Ô§¯õ¾ Û¯Þ±?¾ÔÓ ¸Ó %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "ÃÔÕÝ??³± õ¯ ±Þ±?ÕýÝ¯Ò¯ Óõý?Ý?±?Ó?¯Ó ¨¯ß þÓý?ÝÞ?Þ ÝÓ ÔÝ¾, Óß¯ Ô?õÝ¯Ô??³ ´¯¸Ó?Û¯Ô¾ ß?ßÙ?¯?ÕÛ¾.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&¤ÕÕþÓÔÓÝ?ÓµÕÝÝ ", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "¤?õÒ¯?¯ÔÛÓ ýÕÕµÝÞ§ ´?õÛÙ?¸ÕÝ³..." + IDS_APPLYINGCOMPUTERSETTINGS "ÃÓ±?¯±¾ÔÓÝÝ ´ÓÓýÕ??Ô Û¯ý´'??Õ Ó..." + IDS_RUNNINGSTARTUPSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô þÓ´¾±Û¾..." + IDS_RUNNINGSHUTDOWNSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô þÓÔÕ°ÕÝÝ ¯ß¯ ?Þ..." + IDS_APPLYINGYOURPERSONALSETTINGS "ÃÓ±?¯±¾ÔÓÝÝ ¯±¯ßÞ±?Þ§ ´ÓÓýÕ?? Ô..." + IDS_RUNNINGLOGOFFSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô ÔÞ§¯õ¾ ?þ ±Þ±?ÕýÞ..." + IDS_RUNNINGLOGONSCRIPTS "?ÞÛ¯ÝÓÝÝ ±÷ÕÝÓ??Ô Ô§¯õ¾ õ¯ ±Þ±?ÕýÞ..." + IDS_LOADINGYOURPERSONALSETTINGS "ÃÓÔÓÝ?ÓµÕÝÝ ¯±¯ßÞ±?Þ§ ´ÓÓýÕ?? Ô..." + IDS_CLOSINGNETWORKCONNECTIONS "ÃÓÛÞ?? ýÕÕµÝÞ§ ´?õÛÙ?¸ÕÝ³..." + IDS_REACTOSISSHUTTINGDOWN "ÃÓÔÕ°ÕÝÝ ¯ß¯?Þ ReactOS..." + IDS_PREPARETOSTANDBY "¤?õÒ¯?¯ÔÛÓ õ¯ ÕµÞý¾ ¯¸?Û¾ÔÓÝÝ ..." + IDS_PREPARETOHIBERNATE "¤?õÒ¯?¯ÔÛÓ õ¯ ±´Ù ¸¯Ò¯ ÕµÞý¾..." + IDS_SAVEYOURSETTINGS "ÃßÕÕµÕÝÝ ´ÓÓýÕ??Ô..." + IDS_REACTOSISSTARTINGUP "ÃÓ´¾±Û ReactOS..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon ÝÕ ÔõÓÙ¯± ÓÛ?ÞÔ¾ÔÓ?Þ ¯ß¯Ù¯ÝÛ¾ Û¯Þ±?¾ÔÓ¸Ó!" +END + Property changes on: trunk/reactos/subsys/system/winlogon/Uk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2006-01-12 19:32:43 UTC (rev 20811) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2006-01-12 20:31:08 UTC (rev 20812) @@ -21,3 +21,4 @@ #include "Sv.rc" #include "Hu.rc" #include "Fr.rc" +#include "Uk.rc"

18 years, 8 months

[ion] 20811: Temporarly disable a correct bugcheck in order to hide a ReactOS bug, now that the bug is in bugzilla/ML

by ion＠svn.reactos.org

Temporarly disable a correct bugcheck in order to hide a ReactOS bug, now that the bug is in bugzilla/ML Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 18:56:21 UTC (rev 20810) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 19:32:43 UTC (rev 20811) @@ -87,6 +87,7 @@ AtPassive: +#if 0 /* Make sure that we are not attached and that APCs are not disabled */ movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] @@ -103,7 +104,7 @@ push 0 push APC_INDEX_MISMATCH call _KeBugCheckEx@20 - +#endif ApcsEnabled: #endif

18 years, 8 months

[weiden] 20810: fixed a memory leak in EnterCriticalPolicySection()

by weiden＠svn.reactos.org

fixed a memory leak in EnterCriticalPolicySection() Modified: trunk/reactos/lib/userenv/gpolicy.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:50:39 UTC (rev 20809) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:56:21 UTC (rev 20810) @@ -477,29 +477,29 @@ /* create or open the mutex */ lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); - if (lpSecurityDescriptor == NULL) + if (lpSecurityDescriptor != NULL) { - return NULL; - } + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; - SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); - SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; - SecurityAttributes.bInheritHandle = FALSE; + hSection = CreateMutexW(&SecurityAttributes, + FALSE, + (bMachine ? szMachineGPMutex : szLocalGPMutex)); - hSection = CreateMutexW(&SecurityAttributes, - FALSE, - (bMachine ? szMachineGPMutex : szLocalGPMutex)); + LocalFree((HLOCAL)lpSecurityDescriptor); - if (hSection != NULL) - { - /* wait up to 10 seconds */ - if (WaitForSingleObject(hSection, - 60000) != WAIT_FAILED) + if (hSection != NULL) { - return hSection; + /* wait up to 10 seconds */ + if (WaitForSingleObject(hSection, + 60000) != WAIT_FAILED) + { + return hSection; + } + + CloseHandle(hSection); } - - CloseHandle(hSection); } return NULL;

18 years, 8 months

[weiden] 20809: - implemented RefreshPolicy() and RefreshPolicyEx()

by weiden＠svn.reactos.org

- implemented RefreshPolicy() and RefreshPolicyEx() - added missing definitions to userenv.h Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def Modified: trunk/reactos/lib/userenv/userenv.xml Modified: trunk/reactos/w32api/include/userenv.h _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:50:39 UTC (rev 20809) @@ -45,8 +45,12 @@ static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; +static const WCHAR szLocalGPRefreshEvent[] = L"userenv: user policy refresh event"; +static const WCHAR szLocalGPForceRefreshEvent[] = L"userenv: user policy force refresh event"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; +static const WCHAR szMachineGPRefreshEvent[] = L"Global\\userenv: machine policy refresh event"; +static const WCHAR szMachineGPForceRefreshEvent[] = L"Global\\userenv: machine policy force refresh event"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -412,6 +416,58 @@ return Ret; } +BOOL WINAPI +RefreshPolicy(IN BOOL bMachine) +{ + HANDLE hEvent; + BOOL Ret = TRUE; + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + (bMachine ? szMachineGPRefreshEvent : szLocalGPRefreshEvent)); + if (hEvent != NULL) + { + Ret = SetEvent(hEvent); + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; +} + +BOOL WINAPI +RefreshPolicyEx(IN BOOL bMachine, + IN DWORD dwOptions) +{ + if (dwOptions & ~RP_FORCE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (dwOptions & RP_FORCE) + { + HANDLE hEvent; + BOOL Ret = TRUE; + + hEvent = OpenEventW(EVENT_MODIFY_STATE, + FALSE, + (bMachine ? szMachineGPForceRefreshEvent : szLocalGPForceRefreshEvent)); + if (hEvent != NULL) + { + Ret = SetEvent(hEvent); + CloseHandle(hEvent); + } + + /* return TRUE even if the mutex doesn't exist! */ + return Ret; + } + else + { + return RefreshPolicy(bMachine); + } +} + HANDLE WINAPI EnterCriticalPolicySection(IN BOOL bMachine) { _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:50:39 UTC (rev 20809) @@ -33,6 +33,8 @@ LeaveCriticalPolicySection@4 LoadUserProfileA@8 LoadUserProfileW@8 +RefreshPolicy@4 +RefreshPolicyEx@8 RegisterGPNotification@8 UnloadUserProfile@8 UnregisterGPNotification@4 _____ Modified: trunk/reactos/lib/userenv/userenv.xml --- trunk/reactos/lib/userenv/userenv.xml 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/lib/userenv/userenv.xml 2006-01-12 18:50:39 UTC (rev 20809) @@ -4,6 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> <library>uuid</library> <library>ntdll</library> <library>kernel32</library> _____ Modified: trunk/reactos/w32api/include/userenv.h --- trunk/reactos/w32api/include/userenv.h 2006-01-12 18:05:35 UTC (rev 20808) +++ trunk/reactos/w32api/include/userenv.h 2006-01-12 18:50:39 UTC (rev 20809) @@ -12,6 +12,10 @@ #define PI_NOUI (1) #define PI_APPLYPOLICY (2) +#if (WINVER >= 0x0500) +#define RP_FORCE (1) +#endif + typedef struct _PROFILEINFOA { DWORD dwSize; @@ -70,7 +74,20 @@ BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); BOOL WINAPI DestroyEnvironmentBlock(LPVOID); +#if (WINVER >= 0x0500) +BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); +BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); +#endif +HANDLE WINAPI EnterCriticalPolicySection (BOOL); +BOOL WINAPI LeaveCriticalPolicySection (HANDLE); +BOOL WINAPI RefreshPolicy (BOOL); +#if (WINVER >= 0x0500) +BOOL WINAPI RefreshPolicyEx (BOOL, DWORD); +#endif +BOOL WINAPI RegisterGPNotification (HANDLE, BOOL); +BOOL WINAPI UnregisterGPNotification (HANDLE); + #ifdef UNICODE typedef PROFILEINFOW PROFILEINFO; typedef LPPROFILEINFOW LPPROFILEINFO; @@ -89,6 +106,9 @@ #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryW #define GetProfilesDirectory GetProfilesDirectoryW #define GetUserProfileDirectory GetUserProfileDirectoryW +#if (WINVER >= 0x0500) +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserW +#endif #else typedef PROFILEINFOA PROFILEINFO; typedef LPPROFILEINFOA LPPROFILEINFO; @@ -107,7 +127,10 @@ #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryA #define GetProfilesDirectory GetProfilesDirectoryA #define GetUserProfileDirectory GetUserProfileDirectoryA +#if (WINVER >= 0x0500) +#define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserA #endif +#endif #ifdef __cplusplus }

18 years, 8 months

[weiden] 20808: implemented EnterCriticalPolicySection() and LeaveCriticalPolicySection()

by weiden＠svn.reactos.org

implemented EnterCriticalPolicySection() and LeaveCriticalPolicySection() Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/userenv.def _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 17:52:51 UTC (rev 20807) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 18:05:35 UTC (rev 20808) @@ -44,7 +44,9 @@ } GP_ACTION; static const WCHAR szLocalGPApplied[] = L"userenv: User Group Policy has been applied"; +static const WCHAR szLocalGPMutex[] = L"userenv: user policy mutex"; static const WCHAR szMachineGPApplied[] = L"Global\\userenv: Machine Group Policy has been applied"; +static const WCHAR szMachineGPMutex[] = L"Global\\userenv: machine policy mutex"; static CRITICAL_SECTION GPNotifyLock; static PGP_NOTIFY NotificationList = NULL; @@ -409,3 +411,57 @@ return Ret; } + +HANDLE WINAPI +EnterCriticalPolicySection(IN BOOL bMachine) +{ + SECURITY_ATTRIBUTES SecurityAttributes; + PSECURITY_DESCRIPTOR lpSecurityDescriptor; + HANDLE hSection; + + /* create or open the mutex */ + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + return NULL; + } + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; + SecurityAttributes.bInheritHandle = FALSE; + + hSection = CreateMutexW(&SecurityAttributes, + FALSE, + (bMachine ? szMachineGPMutex : szLocalGPMutex)); + + if (hSection != NULL) + { + /* wait up to 10 seconds */ + if (WaitForSingleObject(hSection, + 60000) != WAIT_FAILED) + { + return hSection; + } + + CloseHandle(hSection); + } + + return NULL; +} + +BOOL WINAPI +LeaveCriticalPolicySection(IN HANDLE hSection) +{ + BOOL Ret; + + if (hSection == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Ret = ReleaseMutex(hSection); + CloseHandle(hSection); + + return Ret; +} _____ Modified: trunk/reactos/lib/userenv/userenv.def --- trunk/reactos/lib/userenv/userenv.def 2006-01-12 17:52:51 UTC (rev 20807) +++ trunk/reactos/lib/userenv/userenv.def 2006-01-12 18:05:35 UTC (rev 20808) @@ -19,6 +19,7 @@ DeleteDesktopItemW@8 @116 NONAME CreateEnvironmentBlock@12 DestroyEnvironmentBlock@4 +EnterCriticalPolicySection@4 ExpandEnvironmentStringsForUserA@16 ExpandEnvironmentStringsForUserW@16 GetAllUsersProfileDirectoryA@8 @@ -29,6 +30,7 @@ GetProfilesDirectoryW@8 GetUserProfileDirectoryA@12 GetUserProfileDirectoryW@12 +LeaveCriticalPolicySection@4 LoadUserProfileA@8 LoadUserProfileW@8 RegisterGPNotification@8

18 years, 8 months

[ion] 20807: Don't release dispatcher lock in ExpBoostThread, we want to re-acquire it instead.

by ion＠svn.reactos.org

Don't release dispatcher lock in ExpBoostThread, we want to re-acquire it instead. Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 17:43:07 UTC (rev 20806) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 17:52:51 UTC (rev 20807) @@ -567,8 +567,8 @@ /* Update the kernel state */ KiSetPriorityThread(OwnerThread, 14, &Released); - /* Release Lock if needed */ - if (!Released) KeReleaseDispatcherDatabaseLockFromDpcLevel(); + /* Reacquire lock if it got releases */ + if (Released) KeAcquireDispatcherDatabaseLockFromDpcLevel(); /* Make sure we're still at dispatch */ ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL);

18 years, 8 months

[ion] 20806: Temporaily disable kernel stack deletion so head is usable again

by ion＠svn.reactos.org

Temporaily disable kernel stack deletion so head is usable again Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-12 17:30:27 UTC (rev 20805) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-12 17:43:07 UTC (rev 20806) @@ -194,7 +194,7 @@ if(Thread->Tcb.Win32Thread != NULL) ExFreePool (Thread->Tcb.Win32Thread); /* Release the Kernel Stack */ - MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, FALSE); + //MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, FALSE); /* Dereference the Process */ ObDereferenceObject(Process);

18 years, 8 months

[weiden] 20805: use a default security descriptor for the group policy events

by weiden＠svn.reactos.org

use a default security descriptor for the group policy events Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/internal.h Modified: trunk/reactos/lib/userenv/misc.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 17:30:27 UTC (rev 20805) @@ -249,7 +249,7 @@ static HANDLE CreateGPEvent(IN BOOL bMachine, - IN PVOID lpSecurityDescriptor) + IN PSECURITY_DESCRIPTOR lpSecurityDescriptor) { HANDLE hEvent; SECURITY_ATTRIBUTES SecurityAttributes; @@ -258,7 +258,7 @@ SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; SecurityAttributes.bInheritHandle = FALSE; - hEvent = CreateEventW((lpSecurityDescriptor != NULL ? &SecurityAttributes : NULL), + hEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, (bMachine ? szMachineGPApplied : szLocalGPApplied)); @@ -271,7 +271,7 @@ IN BOOL bMachine) { PGP_NOTIFY Notify; - PVOID lpSecurityDescriptor = NULL; + PSECURITY_DESCRIPTOR lpSecurityDescriptor = NULL; BOOL Ret = FALSE; EnterCriticalSection(&GPNotifyLock); @@ -292,7 +292,11 @@ /* create or open the machine group policy event */ if (hMachineGPAppliedEvent == NULL) { - lpSecurityDescriptor = CreateDefaultSD(); + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + goto Cleanup; + } hMachineGPAppliedEvent = CreateGPEvent(TRUE, lpSecurityDescriptor); @@ -307,7 +311,11 @@ { if (lpSecurityDescriptor == NULL) { - lpSecurityDescriptor = CreateDefaultSD(); + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + goto Cleanup; + } } hLocalGPAppliedEvent = CreateGPEvent(FALSE, _____ Modified: trunk/reactos/lib/userenv/internal.h --- trunk/reactos/lib/userenv/internal.h 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/internal.h 2006-01-12 17:30:27 UTC (rev 20805) @@ -77,8 +77,8 @@ GetUserSidFromToken (HANDLE hToken, PUNICODE_STRING SidString); -PVOID -CreateDefaultSD(VOID); +PSECURITY_DESCRIPTOR +CreateDefaultSecurityDescriptor(VOID); /* profile.c */ BOOL _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/misc.c 2006-01-12 17:30:27 UTC (rev 20805) @@ -30,6 +30,8 @@ #define NDEBUG #include <debug.h> +static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; /* FUNCTIONS ***************************************************************/ @@ -116,11 +118,149 @@ return TRUE; } -PVOID -CreateDefaultSD(VOID) +PSECURITY_DESCRIPTOR +CreateDefaultSecurityDescriptor(VOID) { - /* FIXME - create a default security descriptor */ - return NULL; + PSID LocalSystemSid = NULL; + PSID AdministratorsSid = NULL; + PSID EveryoneSid = NULL; + PACL Dacl; + DWORD DaclSize; + PSECURITY_DESCRIPTOR pSD = NULL; + + /* create the SYSTEM, Administrators and Everyone SIDs */ + if (!AllocateAndInitializeSid(&LocalSystemAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &LocalSystemSid) || + !AllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid) || + !AllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid)) + { + DPRINT1("Failed initializing the SIDs for the default security descriptor (0x%p, 0x%p, 0x%p)\n", + LocalSystemSid, AdministratorsSid, EveryoneSid); + goto Cleanup; + } + + /* allocate the security descriptor and DACL */ + DaclSize = sizeof(ACL) + + ((GetLengthSid(LocalSystemSid) + + GetLengthSid(AdministratorsSid) + + GetLengthSid(EveryoneSid)) + + (3 * FIELD_OFFSET(ACCESS_ALLOWED_ACE, + SidStart))); + + pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(LMEM_FIXED, + (SIZE_T)DaclSize + sizeof(SECURITY_DESCRIPTOR)); + if (pSD == NULL) + { + DPRINT1("Failed to allocate the default security descriptor and ACL\n"); + goto Cleanup; + } + + if (!InitializeSecurityDescriptor(pSD, + SECURITY_DESCRIPTOR_REVISION)) + { + DPRINT1("Failed to initialize the default security descriptor\n"); + goto Cleanup; + } + + /* initialize and build the DACL */ + Dacl = (PACL)((ULONG_PTR)pSD + sizeof(SECURITY_DESCRIPTOR)); + if (!InitializeAcl(Dacl, + (DWORD)DaclSize, + ACL_REVISION)) + { + DPRINT1("Failed to initialize the DACL of the default security descriptor\n"); + goto Cleanup; + } + + /* add the SYSTEM Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + LocalSystemSid)) + { + DPRINT1("Failed to add the SYSTEM ACE\n"); + goto Cleanup; + } + + /* add the Administrators Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + AdministratorsSid)) + { + DPRINT1("Failed to add the Administrators ACE\n"); + goto Cleanup; + } + + /* add the Everyone Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_EXECUTE, + EveryoneSid)) + { + DPRINT1("Failed to add the Everyone ACE\n"); + goto Cleanup; + } + + /* set the DACL */ + if (!SetSecurityDescriptorDacl(pSD, + TRUE, + Dacl, + FALSE)) + { + DPRINT1("Failed to set the DACL of the default security descriptor\n"); + +Cleanup: + if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + pSD = NULL; + } + } + + if (LocalSystemSid != NULL) + { + FreeSid(LocalSystemSid); + } + if (AdministratorsSid != NULL) + { + FreeSid(AdministratorsSid); + } + if (EveryoneSid != NULL) + { + FreeSid(EveryoneSid); + } + + return pSD; } /* Dynamic DLL loading interface **********************************************/

18 years, 8 months

[jimtabor] 20804: Clean up warning for SafeIconImage might be uninitialized in LoadImageW.

by jimtabor＠svn.reactos.org

Clean up warning for SafeIconImage might be uninitialized in LoadImageW. Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2006-01-12 06:08:42 UTC (rev 20803) +++ trunk/reactos/lib/user32/windows/bitmap.c 2006-01-12 06:15:21 UTC (rev 20804) @@ -93,7 +93,7 @@ ULONG ColorBits; PVOID Data; CURSORICONDIRENTRY* dirEntry; - ICONIMAGE* SafeIconImage; + ICONIMAGE* SafeIconImage = NULL; GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon;

18 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
59
Older →

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 January 2006