Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[fireball] 30339: - Fix a bug (wrong push ... pop order).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 10 23:36:11 2007 New Revision: 30339 URL: http://svn.reactos.org/svn/reactos?rev=30339&view=rev Log: - Fix a bug (wrong push ... pop order). Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Modified: trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except_nt/i386… ============================================================================== --- trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s (original) +++ trunk/reactos/lib/sdk/crt/except_nt/i386/seh.s Sat Nov 10 23:36:11 2007 @@ -79,8 +79,8 @@ glu_return: /* Restore registers and return */ pop ebp - pop esi pop edi + pop esi pop ebx mov esp, ebp pop ebp

17 years, 1 month

[pschweitzer] 30338: Fixed a typo

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 10 23:08:27 2007 New Revision: 30338 URL: http://svn.reactos.org/svn/reactos?rev=30338&view=rev Log: Fixed a typo Modified: trunk/reactos/base/applications/msconfig/msconfig.rc Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Sat Nov 10 23:08:27 2007 @@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Systemconfiguration Tool\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Configuration Tool\0" #define REACTOS_STR_INTERNAL_NAME "msconfig\0" #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe\0" #include <reactos/version.rc>

17 years, 1 month

[peterw] 30337: - Add the logiglib include back, and make the default source dir in appdata.

by peterw＠svn.reactos.org

Author: peterw Date: Sat Nov 10 22:35:53 2007 New Revision: 30337 URL: http://svn.reactos.org/svn/reactos?rev=30337&view=rev Log: - Add the logiglib include back, and make the default source dir in appdata. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 22:35:53 2007 @@ -34,6 +34,7 @@ !include "MUI2.nsh" !include "InstallOptions.nsh" !include "RosSourceDir.nsh" +!include "LogicLib.nsh" ;; MUI begin. Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Sat Nov 10 22:35:53 2007 @@ -6,7 +6,7 @@ Function RosDir.show !insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later." - !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source" + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$APPDATA\RosBE\Source" !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" FunctionEnd

17 years, 1 month

[hpoussin] 30336: Don't mix ReactOS and Wine debug style

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 20:12:43 2007 New Revision: 30336 URL: http://svn.reactos.org/svn/reactos?rev=30336&view=rev Log: Don't mix ReactOS and Wine debug style 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 Sat Nov 10 20:12:43 2007 @@ -354,12 +354,12 @@ // Might as well store it when the user logs on? if(!AllocateAndInitializeSid(&WorldAuthority, - 1, - SECURITY_WORLD_RID, - 0, 0, 0, 0, 0, 0, 0, - &pEveryoneSID)) - { - DPRINT("Failed to initialize security descriptor for logoff thread!\n"); + 1, + SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, + &pEveryoneSID)) + { + ERR("Failed to initialize security descriptor for logoff thread!\n"); return STATUS_UNSUCCESSFUL; } @@ -373,7 +373,7 @@ sizeof(ACL)); if (!pMem) { - DPRINT("Failed to allocate memory for logoff security descriptor!\n"); + ERR("Failed to allocate memory for logoff security descriptor!\n"); return STATUS_NO_MEMORY; } @@ -396,8 +396,8 @@ if (SetEntriesInAcl(1, &Access, NULL, &pACL) != ERROR_SUCCESS) { - // SetEntriesInAcl is not implemented yet - DPRINT1 ("Failed to set Access Rights for logoff thread. Logging out will most likely fail.\n"); + // 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); return STATUS_UNSUCCESSFUL; @@ -405,17 +405,17 @@ if (!InitializeSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) { + ERR("Failed to initialize security descriptor for logoff thread!\n"); HeapFree(GetProcessHeap(), 0, pMem); - DPRINT("Failed to initialize security descriptor for logoff thread!\n"); return STATUS_UNSUCCESSFUL; } if (!SetSecurityDescriptorDacl(SecurityDescriptor, - TRUE, // bDaclPresent flag - pACL, - FALSE)) // not a default DACL - { - DPRINT("SetSecurityDescriptorDacl Error %u\n", GetLastError()); + TRUE, // bDaclPresent flag + pACL, + FALSE)) // not a default DACL + { + ERR("SetSecurityDescriptorDacl Error %u\n", GetLastError()); HeapFree(GetProcessHeap(), 0, pMem); return STATUS_UNSUCCESSFUL; }

17 years, 1 month

[ekohl] 30335: - Notify the system of changes to the environment variables. - Parse pagefile sizes properly. - Make pagefile sizes fully readable.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 10 19:50:22 2007 New Revision: 30335 URL: http://svn.reactos.org/svn/reactos?rev=30335&view=rev Log: - Notify the system of changes to the environment variables. - Parse pagefile sizes properly. - Make pagefile sizes fully readable. Modified: trunk/reactos/dll/cpl/sysdm/environment.c trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Nov 10 19:50:22 2007 @@ -723,6 +723,8 @@ case IDOK: SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + SendMessage(HWND_BROADCAST, WM_WININICHANGE, + 0, (LPARAM)_T("Environment")); EndDialog(hwndDlg, 0); return TRUE; Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sat Nov 10 19:50:22 2007 @@ -67,21 +67,37 @@ } -static INT -GetPageFileSizes(LPTSTR lpPageFiles) -{ +static VOID +GetPageFileSizes(LPTSTR lpPageFiles, + LPINT lpInitialSize, + LPINT lpMaximumSize) +{ + INT i = 0; + + *lpInitialSize = -1; + *lpMaximumSize = -1; + while (*lpPageFiles != _T('\0')) { if (*lpPageFiles == _T(' ')) { lpPageFiles++; - return (INT)_ttoi(lpPageFiles); + + switch (i) + { + case 0: + *lpInitialSize = (INT)_ttoi(lpPageFiles); + i = 1; + break; + + case 1: + *lpMaximumSize = (INT)_ttoi(lpPageFiles); + return; + } } lpPageFiles++; } - - return -1; } @@ -123,8 +139,9 @@ if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) { /* FIXME: we only check the first available pagefile in the reg */ - InitialSize = GetPageFileSizes(pVirtMem->szPagingFiles); - MaxSize = GetPageFileSizes(pVirtMem->szPagingFiles); + GetPageFileSizes(pVirtMem->szPagingFiles, + &InitialSize, + &MaxSize); pVirtMem->Pagefile[PgCnt].InitialValue = InitialSize; pVirtMem->Pagefile[PgCnt].MaxValue = MaxSize; @@ -245,7 +262,7 @@ static VOID SetListBoxColumns(HWND hwndListBox) { - const INT tabs[2] = {30, 170}; + const INT tabs[2] = {30, 120}; SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)&tabs[0]); }

17 years, 1 month

[ekohl] 30334: Clean-up the resource files: - Pushbuttons always have a height of 14 units. - Use AUTOCHECKBOX and AUTORADIOBUTTON instead of CONTROL. - Fix indentation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 10 19:44:52 2007 New Revision: 30334 URL: http://svn.reactos.org/svn/reactos?rev=30334&view=rev Log: Clean-up the resource files: - Pushbuttons always have a height of 14 units. - Use AUTOCHECKBOX and AUTORADIOBUTTON instead of CONTROL. - Fix indentation. Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r…

17 years, 1 month

[pschweitzer] 30333: - Added dead keys name - Removed some comments

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 10 19:22:06 2007 New Revision: 30333 URL: http://svn.reactos.org/svn/reactos?rev=30333&view=rev Log: - Added dead keys name - Removed some comments Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.c (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.c Sat Nov 10 19:22:06 2007 @@ -180,7 +180,7 @@ /* The numbers */ { '1', NOCAPS, {'&', '1'} }, /* Specials */ - /* Ctrl-_ generates US */ + /* Ctrl-_ generates FR */ { VK_OEM_5 ,NOCAPS, {'*',0xb5} }, /* */ { VK_OEM_3 ,NOCAPS, {0xf9, '%'} }, /* ù */ { VK_OEM_COMMA ,NOCAPS, {',', '?'} }, @@ -257,10 +257,6 @@ ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { /* x,x, Normal, Shifted, Ctrl, Alt, C-S-x */ /* Legacy Ascii generators */ - //{ '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, - //{ '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, - //{ VK_OEM_MINUS, NOCAPS, {')', '°', WCH_NONE, 0x1f /* US */} }, - //{ '5' | KEXT , NOCAPS, {')', '°', '#' , 0x1f /* US */} }, { '5' , 1 , {'(', '5', WCH_NONE , '[' , 0x1b} }, { '6' , 1 , {'-', '6', WCH_NONE , '|' , 0x1f} }, { '8' , 1 , {'_', '8', WCH_NONE , '\\' , 0x1c} }, @@ -437,6 +433,13 @@ { 0, NULL }, }; +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x005e" L"Circumflex", + L"\x007e" L"Tilde", + L"\x0060" L"Grave", + NULL +}; + /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ @@ -451,7 +454,7 @@ /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, - NULL, /* Dead key names */ + dead_key_names, /* Dead key names */ /* scan code to virtual key maps */ scancode_to_vk,

17 years, 1 month

[greatlrd] 30332: Merge from ReactX branch to trunk ---------------------------------------------------------------------------------- Adding dxtn.dll to reactos it is need for mesa opengl to use compress texture. for some issue this library are not build default, it need the patent flag be set NSWPAT="1", This library are need it for opengl compress texture. But it will not be in the official build, only for thus doing own build and activate the patent flag, will be avail use compress texture.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 10 19:02:43 2007 New Revision: 30332 URL: http://svn.reactos.org/svn/reactos?rev=30332&view=rev Log: Merge from ReactX branch to trunk ---------------------------------------------------------------------------------- Adding dxtn.dll to reactos it is need for mesa opengl to use compress texture. for some issue this library are not build default, it need the patent flag be set NSWPAT="1", This library are need it for opengl compress texture. But it will not be in the official build, only for thus doing own build and activate the patent flag, will be avail use compress texture. I have spoken with Aleasky about this library. Added: trunk/reactos/dll/3rdparty/dxtn/ trunk/reactos/dll/3rdparty/dxtn/Makefile (with props) trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ (with props) trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw (with props) trunk/reactos/dll/3rdparty/dxtn/Makefile.vc (with props) trunk/reactos/dll/3rdparty/dxtn/Makefile.wat (with props) trunk/reactos/dll/3rdparty/dxtn/docs/ trunk/reactos/dll/3rdparty/dxtn/docs/README (with props) trunk/reactos/dll/3rdparty/dxtn/docs/fxt1license.txt (with props) trunk/reactos/dll/3rdparty/dxtn/docs/tc.html (with props) trunk/reactos/dll/3rdparty/dxtn/docs/texture_compression_FXT1.txt (with props) trunk/reactos/dll/3rdparty/dxtn/docs/texture_compression_s3tc.txt (with props) trunk/reactos/dll/3rdparty/dxtn/docs/vmath.txt (with props) trunk/reactos/dll/3rdparty/dxtn/dxtn.c (with props) trunk/reactos/dll/3rdparty/dxtn/dxtn.def (with props) trunk/reactos/dll/3rdparty/dxtn/dxtn.h (with props) trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild (with props) trunk/reactos/dll/3rdparty/dxtn/fxt1.c (with props) trunk/reactos/dll/3rdparty/dxtn/fxt1.h (with props) trunk/reactos/dll/3rdparty/dxtn/internal.h (with props) trunk/reactos/dll/3rdparty/dxtn/test/ trunk/reactos/dll/3rdparty/dxtn/test/Makefile (with props) trunk/reactos/dll/3rdparty/dxtn/test/main.c (with props) trunk/reactos/dll/3rdparty/dxtn/test/tga.c (with props) trunk/reactos/dll/3rdparty/dxtn/test/tga.h (with props) trunk/reactos/dll/3rdparty/dxtn/test/util.c (with props) trunk/reactos/dll/3rdparty/dxtn/test/util.h (with props) trunk/reactos/dll/3rdparty/dxtn/texstore.c (with props) trunk/reactos/dll/3rdparty/dxtn/types.h (with props) trunk/reactos/dll/3rdparty/dxtn/wrapper.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/3rdparty/3rdparty.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/3rdparty.rbui… Added: trunk/reactos/dll/3rdparty/dxtn/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile… Added: trunk/reactos/dll/3rdparty/dxtn/Makefile.DJ URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile… Added: trunk/reactos/dll/3rdparty/dxtn/Makefile.mgw URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile… Added: trunk/reactos/dll/3rdparty/dxtn/Makefile.vc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile… Added: trunk/reactos/dll/3rdparty/dxtn/Makefile.wat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/Makefile… Added: trunk/reactos/dll/3rdparty/dxtn/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/REA… Added: trunk/reactos/dll/3rdparty/dxtn/docs/fxt1license.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/fxt… Added: trunk/reactos/dll/3rdparty/dxtn/docs/tc.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/tc.… Added: trunk/reactos/dll/3rdparty/dxtn/docs/texture_compression_FXT1.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/tex… Added: trunk/reactos/dll/3rdparty/dxtn/docs/texture_compression_s3tc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/tex… Added: trunk/reactos/dll/3rdparty/dxtn/docs/vmath.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/docs/vma… Added: trunk/reactos/dll/3rdparty/dxtn/dxtn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.c?r… Added: trunk/reactos/dll/3rdparty/dxtn/dxtn.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.def… Added: trunk/reactos/dll/3rdparty/dxtn/dxtn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.h?r… Added: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu… Added: trunk/reactos/dll/3rdparty/dxtn/fxt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/fxt1.c?r… Added: trunk/reactos/dll/3rdparty/dxtn/fxt1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/fxt1.h?r… Added: trunk/reactos/dll/3rdparty/dxtn/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/internal… Added: trunk/reactos/dll/3rdparty/dxtn/test/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/Mak… Added: trunk/reactos/dll/3rdparty/dxtn/test/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/mai… Added: trunk/reactos/dll/3rdparty/dxtn/test/tga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/tga… Added: trunk/reactos/dll/3rdparty/dxtn/test/tga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/tga… Added: trunk/reactos/dll/3rdparty/dxtn/test/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/uti… Added: trunk/reactos/dll/3rdparty/dxtn/test/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/test/uti… Added: trunk/reactos/dll/3rdparty/dxtn/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/texstore… Added: trunk/reactos/dll/3rdparty/dxtn/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/types.h?… Added: trunk/reactos/dll/3rdparty/dxtn/wrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/wrapper.…

17 years, 1 month

[mbosma] 30331: Fix CreateLogoffSecurityAttributes. It does still not work because SetEntriesInAcl is not implemented yet.

by mbosma＠svn.reactos.org

Author: mbosma Date: Sat Nov 10 18:56:36 2007 New Revision: 30331 URL: http://svn.reactos.org/svn/reactos?rev=30331&view=rev Log: Fix CreateLogoffSecurityAttributes. It does still not work because SetEntriesInAcl is not implemented yet. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h 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 Sat Nov 10 18:56:36 2007 @@ -319,7 +319,7 @@ CreateLogoffSecurityAttributes( OUT PSECURITY_ATTRIBUTES* ppsa) { - /* The following code is no only incomplete, it's a mess and uncompilable */ + /* The following code is not working yet and messy */ /* Still, it gives some ideas about data types and functions involved and */ /* required to set up a SECURITY_DESCRIPTOR for a SECURITY_ATTRIBUTES */ /* instance for a thread, to allow that thread to ImpersonateLoggedOnUser(). */ @@ -328,7 +328,9 @@ PSECURITY_ATTRIBUTES psa = 0; BYTE* pMem; PACL pACL; - //EXPLICIT_ACCESS ea[2]; + EXPLICIT_ACCESS Access; + PSID pEveryoneSID = NULL; + static SID_IDENTIFIER_AUTHORITY WorldAuthority = { SECURITY_WORLD_SID_AUTHORITY }; *ppsa = NULL; @@ -351,6 +353,16 @@ // while the user's SID obviously must be created for each new user. // Might as well store it when the user logs on? + if(!AllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, + &pEveryoneSID)) + { + DPRINT("Failed to initialize security descriptor for logoff thread!\n"); + return STATUS_UNSUCCESSFUL; + } + /* set up the required security attributes to be able to shut down */ /* To save space and time, allocate a single block of memory holding */ /* both SECURITY_ATTRIBUTES and SECURITY_DESCRIPTOR */ @@ -372,6 +384,25 @@ SecurityDescriptor = (PSECURITY_DESCRIPTOR)(pMem + sizeof(SECURITY_ATTRIBUTES)); pACL = (PACL)(((PBYTE)SecurityDescriptor) + SECURITY_DESCRIPTOR_MIN_LENGTH); + // Initialize an EXPLICIT_ACCESS structure for an ACE. + // The ACE will allow this thread to log off (and shut down the system, currently). + ZeroMemory(&Access, sizeof(Access)); + Access.grfAccessPermissions = THREAD_SET_THREAD_TOKEN; + Access.grfAccessMode = SET_ACCESS; // GRANT_ACCESS? + Access.grfInheritance = NO_INHERITANCE; + Access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + Access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + Access.Trustee.ptstrName = pEveryoneSID; + + if (SetEntriesInAcl(1, &Access, NULL, &pACL) != ERROR_SUCCESS) + { + // SetEntriesInAcl is not implemented yet + DPRINT1 ("Failed to set Access Rights for logoff thread. Logging out will most likely fail.\n"); + + HeapFree(GetProcessHeap(), 0, pMem); + return STATUS_UNSUCCESSFUL; + } + if (!InitializeSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) { HeapFree(GetProcessHeap(), 0, pMem); @@ -379,18 +410,7 @@ return STATUS_UNSUCCESSFUL; } - // Initialize an EXPLICIT_ACCESS structure for an ACE. - // The ACE will allow this thread to log off (and shut down the system, currently). -#if 0 - ZeroMemory(ea, sizeof(ea)); - ea[0].grfAccessPermissions = THREAD_SET_THREAD_TOKEN; - ea[0].grfAccessMode = SET_ACCESS; // GRANT_ACCESS? - ea[0].grfInheritance= NO_INHERITANCE; - ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID; - ea[0].Trustee.TrusteeType = TRUSTEE_IS_USER; - ea[0].Trustee.ptstrName = (LPTSTR) pEveryoneSID; - - if (!SetSecurityDescriptorDacl(pSD, + if (!SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, // bDaclPresent flag pACL, FALSE)) // not a default DACL @@ -399,7 +419,6 @@ HeapFree(GetProcessHeap(), 0, pMem); return STATUS_UNSUCCESSFUL; } -#endif psa->nLength = sizeof(SECURITY_ATTRIBUTES); psa->lpSecurityDescriptor = SecurityDescriptor; @@ -447,14 +466,9 @@ Status = CreateLogoffSecurityAttributes(&psa); if (!NT_SUCCESS(Status)) { - WARN("Failed to create a required security descriptor. Status 0x%08x\n", Status); -#if 1 - WARN("Attempting to continue without it.\n"); -#else - ERR("Aborting logoff\n"); + ERR("Failed to create a required security descriptor. Status 0x%08x\n", Status); HeapFree(GetProcessHeap(), 0, LSData); return Status; -#endif } /* Run logoff thread */ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Sat Nov 10 18:56:36 2007 @@ -36,6 +36,8 @@ #include <exfuncs.h> #include <setypes.h> #include <ntsecapi.h> +#include <accctrl.h> +#include <aclapi.h> #include <reactos/winlogon.h>

17 years, 1 month

[hpoussin] 30330: Rename variables

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 10 18:47:01 2007 New Revision: 30330 URL: http://svn.reactos.org/svn/reactos?rev=30330&view=rev Log: Rename variables Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sat Nov 10 18:47:01 2007 @@ -931,18 +931,18 @@ return FALSE; } memcpy( - &DeviceInfoListDetailData->ClassGuid, - &list->ClassGuid, + &DevInfoData->ClassGuid, + &set->ClassGuid, sizeof(GUID)); - DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; - if (list->MachineName) + DevInfoData->RemoteMachineHandle = set->hMachine; + if (set->MachineName) { FIXME("Stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } else - DeviceInfoListDetailData->RemoteMachineName[0] = 0; + DevInfoData->RemoteMachineName[0] = 0; return TRUE; } @@ -975,14 +975,14 @@ return FALSE; } memcpy( - &DeviceInfoListDetailData->ClassGuid, - &list->ClassGuid, + &DevInfoData->ClassGuid, + &set->ClassGuid, sizeof(GUID)); - DeviceInfoListDetailData->RemoteMachineHandle = list->hMachine; - if (list->MachineName) - strcpyW(DeviceInfoListDetailData->RemoteMachineName, list->MachineName + 2); + DevInfoData->RemoteMachineHandle = set->hMachine; + if (set->MachineName) + strcpyW(DevInfoData->RemoteMachineName, set->MachineName + 2); else - DeviceInfoListDetailData->RemoteMachineName[0] = 0; + DevInfoData->RemoteMachineName[0] = 0; return TRUE; }

17 years, 1 month

← Newer
1
...
56
57
58
59
60
61
62
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007