Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[hbelusca] 70714: [SYSICON]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 12 17:21:32 2016 New Revision: 70714 URL: http://svn.reactos.org/svn/reactos?rev=70714&view=rev Log: [SYSICON]: Whitespace fixes only. Modified: trunk/rostests/win32/user32/sysicon/sysicon.c Modified: trunk/rostests/win32/user32/sysicon/sysicon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/sysicon/sysi… ============================================================================== --- trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] Fri Feb 12 17:21:32 2016 @@ -76,7 +76,7 @@ memset(&wcx, 0, sizeof(wcx)); wcx.cbSize = sizeof(wcx); - wcx.lpfnWndProc = (WNDPROC) WndProc; + wcx.lpfnWndProc = (WNDPROC)WndProc; wcx.hInstance = hInst; wcx.hbrBackground = (HBRUSH)COLOR_WINDOW; wcx.lpszClassName = WndClass; @@ -92,7 +92,7 @@ hWnd1a = CreateWindowExW(WS_EX_DLGMODALFRAME, WndClass, L"WS_SYSMENU | WS_EX_DLGMODALFRAME without user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -107,7 +107,7 @@ hWnd1b = CreateWindowExW(WS_EX_DLGMODALFRAME, WndClass, L"WS_SYSMENU | WS_EX_DLGMODALFRAME with user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -124,7 +124,7 @@ hWnd2a = CreateWindowExW(WS_EX_TOOLWINDOW, WndClass, L"WS_SYSMENU | WS_EX_TOOLWINDOW without user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -138,7 +138,7 @@ hWnd2b = CreateWindowExW(WS_EX_TOOLWINDOW, WndClass, L"WS_SYSMENU | WS_EX_TOOLWINDOW with user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0,

8 years, 9 months

[hbelusca] 70713: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 12 16:40:36 2016 New Revision: 70713 URL: http://svn.reactos.org/svn/reactos?rev=70713&view=rev Log: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks. Modified: trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Interface between Win32k and USERSRV * FILE: win32ss/user/ntuser/csr.c - * PROGRAMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on * the original code by Ge van Geldorp (ge(a)gse.nl) and by * the CSR code in NTDLL. */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -397,9 +397,8 @@ { BOOL Ret = FALSE; - if ( pWnd->style & WS_VISIBLE && (pWnd->style & WS_CAPTION) == WS_CAPTION ) + if ( (pWnd->style & WS_VISIBLE) && ((pWnd->style & WS_CAPTION) == WS_CAPTION) ) { - if (pWnd->state & WNDS_HASCAPTION && pWnd->head.pti->MessageQueue == gpqForeground) Flags |= DC_ACTIVE; /* Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -103,7 +103,7 @@ /* FIXME: Do some more security checks here */ - /* FIXME: The first check is a reactos specific hack for system threads */ + /* FIXME: HACK: The first check is a reactos specific hack for system threads */ if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && ptiCurrent->ppi != ppiCsr) { Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -724,8 +724,8 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - ERR("Parent is Desktop, Min off screen!\n"); - /* ReactOS doesn't support iconic minimize to desktop */ + ERR("FIXME: Parent is Desktop, Min off screen!\n"); + /* FIXME: ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; Window->InternalPos.IconPos.x = Pos->x;

8 years, 9 months

[hbelusca] 70712: But do not compile by default those extra tests. Colin, it is curious that when rosautotest encounters a test EXE that it doesn't like, it just completely bails out the test sessi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 12 15:24:30 2016 New Revision: 70712 URL: http://svn.reactos.org/svn/reactos?rev=70712&view=rev Log: But do not compile by default those extra tests. Colin, it is curious that when rosautotest encounters a test EXE that it doesn't like, it just completely bails out the test session. This should be fixed/behaviour improved. Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=70712&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Fri Feb 12 15:24:30 2016 @@ -13,7 +13,7 @@ #add_subdirectory(regtests) add_subdirectory(rosautotest) add_subdirectory(tests) -add_subdirectory(win32) +#add_subdirectory(win32) add_subdirectory(winetests)

8 years, 9 months

[hbelusca] 70711: I forgot this file.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 12 15:12:54 2016 New Revision: 70711 URL: http://svn.reactos.org/svn/reactos?rev=70711&view=rev Log: I forgot this file. Added: trunk/rostests/win32/user32/sysicon/sysicon.rc (with props) Added: trunk/rostests/win32/user32/sysicon/sysicon.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/sysicon/sysi… ============================================================================== --- trunk/rostests/win32/user32/sysicon/sysicon.rc (added) +++ trunk/rostests/win32/user32/sysicon/sysicon.rc [iso-8859-1] Fri Feb 12 15:12:54 2016 @@ -0,0 +1 @@ +100 ICON "sysicon.ico" Propchange: trunk/rostests/win32/user32/sysicon/sysicon.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[hbelusca] 70710: [ROSTESTS]: Add "sysicon" test back, and augment it.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 12 15:10:59 2016 New Revision: 70710 URL: http://svn.reactos.org/svn/reactos?rev=70710&view=rev Log: [ROSTESTS]: Add "sysicon" test back, and augment it. Added: trunk/rostests/win32/user32/CMakeLists.txt (with props) trunk/rostests/win32/user32/sysicon/CMakeLists.txt (with props) trunk/rostests/win32/user32/sysicon/sysicon.ico - copied unchanged from r70704, trunk/rostests/dibtests/vbltest/test_inv32.ico Modified: trunk/rostests/CMakeLists.txt trunk/rostests/win32/CMakeLists.txt trunk/rostests/win32/user32/sysicon/sysicon.c Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=70710&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Fri Feb 12 15:10:59 2016 @@ -13,7 +13,7 @@ #add_subdirectory(regtests) add_subdirectory(rosautotest) add_subdirectory(tests) -#add_subdirectory(win32) +add_subdirectory(win32) add_subdirectory(winetests) Modified: trunk/rostests/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/win32/CMakeLists.txt [iso-8859-1] Fri Feb 12 15:10:59 2016 @@ -1 +1,2 @@ add_subdirectory(kernel32) +add_subdirectory(user32) Added: trunk/rostests/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/CMakeLists.t… ============================================================================== --- trunk/rostests/win32/user32/CMakeLists.txt (added) +++ trunk/rostests/win32/user32/CMakeLists.txt [iso-8859-1] Fri Feb 12 15:10:59 2016 @@ -0,0 +1 @@ +add_subdirectory(sysicon) Propchange: trunk/rostests/win32/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/user32/sysicon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/sysicon/CMak… ============================================================================== --- trunk/rostests/win32/user32/sysicon/CMakeLists.txt (added) +++ trunk/rostests/win32/user32/sysicon/CMakeLists.txt [iso-8859-1] Fri Feb 12 15:10:59 2016 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + sysicon.c + sysicon.rc) + +add_executable(sysicon ${SOURCE}) +target_link_libraries(sysicon ${PSEH_LIB}) +set_module_type(sysicon win32gui UNICODE) +add_importlibs(sysicon gdi32 user32 msvcrt kernel32) +add_cd_file(TARGET sysicon DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/win32/user32/sysicon/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/win32/user32/sysicon/sysicon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/sysicon/sysi… ============================================================================== --- trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] Fri Feb 12 15:10:59 2016 @@ -21,143 +21,175 @@ * about WS_EX_DLGMODALFRAME and WS_EX_TOOLWINDOW */ -#include "windows.h" -#include "stdio.h" -#include "resource.h" +#include <windows.h> +#include <stdio.h> WCHAR WndClass[] = L"sysicon_class"; +HICON hIcon = NULL, hIconSm = NULL; LRESULT CALLBACK WndProc(HWND hWnd, - UINT msg, - WPARAM wParam, - LPARAM lParam) + UINT msg, + WPARAM wParam, + LPARAM lParam) { + switch (msg) + { + case WM_PAINT: + { + HDC hDc; + PAINTSTRUCT Ps; + RECT Rect; + GetClientRect(hWnd, &Rect); - switch (msg) - { + Rect.left = 10; + Rect.top = 10; + Rect.right -= 10; + Rect.bottom = 25; - case WM_PAINT: - { - HDC hDc; - PAINTSTRUCT Ps; - RECT Rect; - GetClientRect(hWnd, &Rect); + hDc = BeginPaint(hWnd, &Ps); + SetBkMode(hDc, TRANSPARENT); - Rect.left = 10; - Rect.top = 10; - Rect.right-=10; - Rect.bottom = 25; + DrawCaption(hWnd, hDc, &Rect, DC_GRADIENT | DC_ACTIVE | DC_TEXT | DC_ICON); - hDc = BeginPaint(hWnd, &Ps); - SetBkMode( hDc, TRANSPARENT ); + EndPaint(hWnd, &Ps); - DrawCaption(hWnd, hDc, &Rect, DC_GRADIENT | DC_ACTIVE | DC_TEXT | DC_ICON); + return 0; + } - EndPaint(hWnd, &Ps); + case WM_DESTROY: + PostQuitMessage(0); + return 0; + } - return 0; - } - - case WM_DESTROY: - PostQuitMessage(0); - return 0; - } - - return DefWindowProc(hWnd, msg, wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); } int APIENTRY wWinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPWSTR lpCmdLine, - int nCmdShow) + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) { - HWND hWnd1, hWnd2, hWnd3; - MSG msg; - WNDCLASSEX wcx; - UINT result; + HWND hWnd1a, hWnd1b, hWnd2a, hWnd2b, hWnd3a, hWnd3b; + MSG msg; + WNDCLASSEXW wcx; + UINT result; - memset(&wcx, 0, sizeof(wcx)); - wcx.cbSize = sizeof(wcx); - wcx.lpfnWndProc = (WNDPROC) WndProc; - wcx.hInstance = hInst; - wcx.hbrBackground = (HBRUSH)COLOR_WINDOW; - wcx.lpszClassName = WndClass; + memset(&wcx, 0, sizeof(wcx)); + wcx.cbSize = sizeof(wcx); + wcx.lpfnWndProc = (WNDPROC) WndProc; + wcx.hInstance = hInst; + wcx.hbrBackground = (HBRUSH)COLOR_WINDOW; + wcx.lpszClassName = WndClass; - if(!(result = RegisterClassEx(&wcx))) - { - return 1; - } + if (!(result = RegisterClassExW(&wcx))) + return 1; - /* WS_EX_DLGMODALFRAME */ - hWnd1 = CreateWindowEx(WS_EX_DLGMODALFRAME, - WndClass, - L"WS_SYSMENU | WS_EX_DLGMODALFRAME", - WS_CAPTION | WS_SYSMENU , - CW_USEDEFAULT, - CW_USEDEFAULT, - 400, - 100, - NULL, - 0, - hInst, - NULL); + /* Load the user icons */ + hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(100), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); - if(!hWnd1) - { - return 1; - } + /* WS_EX_DLGMODALFRAME */ + hWnd1a = CreateWindowExW(WS_EX_DLGMODALFRAME, + WndClass, + L"WS_SYSMENU | WS_EX_DLGMODALFRAME without user icon", + WS_CAPTION | WS_SYSMENU , + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); + if (!hWnd1a) + return 1; - ShowWindow(hWnd1, SW_SHOW); - UpdateWindow(hWnd1); + ShowWindow(hWnd1a, SW_SHOW); + UpdateWindow(hWnd1a); - hWnd2 = CreateWindowEx(WS_EX_TOOLWINDOW, - WndClass, - L"WS_SYSMENU | WS_EX_TOOLWINDOW", - WS_CAPTION | WS_SYSMENU , - CW_USEDEFAULT, - CW_USEDEFAULT, - 400, - 100, - NULL, - 0, - hInst, - NULL); + /* WS_EX_DLGMODALFRAME */ + hWnd1b = CreateWindowExW(WS_EX_DLGMODALFRAME, + WndClass, + L"WS_SYSMENU | WS_EX_DLGMODALFRAME with user icon", + WS_CAPTION | WS_SYSMENU , + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); - if(!hWnd2) - { - return 1; - } + if (!hWnd1b) + return 1; - ShowWindow(hWnd2, SW_SHOW); - UpdateWindow(hWnd2); + ShowWindow(hWnd1b, SW_SHOW); + UpdateWindow(hWnd1b); + SendMessageW(hWnd1b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + SendMessageW(hWnd1b, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - hWnd3 = CreateWindowEx(0, - WndClass, - L"WS_SYSMENU ", - WS_CAPTION | WS_SYSMENU , - CW_USEDEFAULT, - CW_USEDEFAULT, - 400, - 100, - NULL, - 0, - hInst, - NULL); + hWnd2a = CreateWindowExW(WS_EX_TOOLWINDOW, + WndClass, + L"WS_SYSMENU | WS_EX_TOOLWINDOW without user icon", + WS_CAPTION | WS_SYSMENU , + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); + if (!hWnd2a) + return 1; - if(!hWnd3) - { - return 1; - } + ShowWindow(hWnd2a, SW_SHOW); + UpdateWindow(hWnd2a); - ShowWindow(hWnd3, SW_SHOW); - UpdateWindow(hWnd3); + hWnd2b = CreateWindowExW(WS_EX_TOOLWINDOW, + WndClass, + L"WS_SYSMENU | WS_EX_TOOLWINDOW with user icon", + WS_CAPTION | WS_SYSMENU , + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); + if (!hWnd2b) + return 1; - while(GetMessage(&msg, NULL, 0, 0 )) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } + ShowWindow(hWnd2b, SW_SHOW); + UpdateWindow(hWnd2b); + SendMessageW(hWnd2b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + SendMessageW(hWnd2b, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - UnregisterClass(WndClass, hInst); - return 0; + hWnd3a = CreateWindowExW(0, + WndClass, + L"WS_SYSMENU without user icon", + WS_CAPTION | WS_SYSMENU, + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); + if (!hWnd3a) + return 1; + + ShowWindow(hWnd3a, SW_SHOW); + UpdateWindow(hWnd3a); + + hWnd3b = CreateWindowExW(0, + WndClass, + L"WS_SYSMENU with user icon", + WS_CAPTION | WS_SYSMENU, + CW_USEDEFAULT, CW_USEDEFAULT, + 400, 100, + NULL, 0, + hInst, NULL); + if (!hWnd3b) + return 1; + + ShowWindow(hWnd3b, SW_SHOW); + UpdateWindow(hWnd3b); + SendMessageW(hWnd3b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); + SendMessageW(hWnd3b, WM_SETICON, ICON_BIG, (LPARAM)hIcon); + + while(GetMessageW(&msg, NULL, 0, 0 )) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + if (hIcon) DestroyIcon(hIcon); + if (hIconSm) DestroyIcon(hIconSm); + + UnregisterClassW(WndClass, hInst); + return 0; }

8 years, 9 months

[hbelusca] 70709: [FREELDR]: Continue removing code not related to freeldr entry-point from entry.S, and adopt source file names for i386 architecture similar to those of amd64.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 11 22:33:03 2016 New Revision: 70709 URL: http://svn.reactos.org/svn/reactos?rev=70709&view=rev Log: [FREELDR]: Continue removing code not related to freeldr entry-point from entry.S, and adopt source file names for i386 architecture similar to those of amd64. Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S - copied, changed from r70708, trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/pnpbios.S - copied unchanged from r70708, trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Thu Feb 11 22:33:03 2016 @@ -96,7 +96,8 @@ if(ARCH STREQUAL "i386") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/entry.S - arch/i386/i386pnp.S + arch/i386/int386.S + arch/i386/pnpbios.S arch/i386/i386trap.S arch/i386/linux.S arch/i386/mb.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Thu Feb 11 22:33:03 2016 @@ -52,6 +52,7 @@ /* Continue execution */ jmp dword ptr ds:[ContinueAddress] +PUBLIC ContinueAddress ContinueAddress: .long _FrldrStartup @@ -95,60 +96,6 @@ jmp stop nop nop - -Int386_regsin: - .long 0 -Int386_regsout: - .long 0 - -/* - * int Int386(int ivec, REGS* in, REGS* out); - */ -PUBLIC _Int386 -_Int386: - - /* Get the function parameters */ - mov eax, dword ptr [esp + 4] - mov dword ptr ds:[BSS_IntVector], eax - mov eax, dword ptr [esp + 8] - mov dword ptr [Int386_regsin], eax - mov eax, dword ptr [esp + 12] - mov dword ptr [Int386_regsout], eax - - /* Save all registers + segment registers */ - push ds - push es - push fs - push gs - pusha - - /* Copy input registers */ - mov esi, dword ptr [Int386_regsin] - mov edi, BSS_RegisterSet - mov ecx, REGS_SIZE / 4 - rep movsd - - /* Set the function ID */ - mov bx, FNID_Int386 - - /* Set continue address and switch to real mode */ - mov dword ptr [ContinueAddress], offset Int386_return - jmp SwitchToReal - -Int386_return: - - /* Copy output registers */ - mov esi, BSS_RegisterSet - mov edi, dword ptr [Int386_regsout] - mov ecx, REGS_SIZE / 4 - rep movsd - - popa - pop gs - pop fs - pop es - pop ds - ret /* @@ -195,7 +142,7 @@ /* Set the function ID */ mov bx, FNID_Reboot - /*Switch to real mode (We don't return) */ + /* Switch to real mode (we don't return) */ jmp SwitchToReal @@ -207,7 +154,7 @@ /* Set the function ID */ mov bx, FNID_ChainLoadBiosBootSectorCode - /*Switch to real mode (We don't return) */ + /* Switch to real mode (we don't return) */ jmp SwitchToReal @@ -223,6 +170,7 @@ /* Entrypoint for realmode function calls * ContinueAddress must be set to the return point from realmode * bx must be set to the ID of the realmode function to call. */ +PUBLIC SwitchToReal SwitchToReal: /* Set sane segments */ mov ax, PMODE_DS Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S (removed) @@ -1,184 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <asm.inc> -#include <arch/pc/x86common.h> - -EXTERN i386CallRealMode:PROC - -.code32 - -/* - * U32 PnpBiosSupported(VOID); - * - * RETURNS: - */ -PUBLIC _PnpBiosSupported -_PnpBiosSupported: - - push edi - push esi - push ecx - push edx - - xor edi, edi - - /* init esi */ - mov esi, HEX(0F0000) - -pnp_again: - mov eax, [esi] - cmp eax, HEX(506E5024) /* "$PnP" */ - je pnp_found - - cmp esi, HEX(0FFFF0) - je pnp_not_found - -pnp_add: - add esi, 16 - jmp pnp_again - -pnp_found: - /* first calculate the checksum */ - push esi - - push HEX(21) - pop ecx - xor edx, edx - -pnp_loop: - lodsb - add dl, al - loop pnp_loop - - test dl, dl - pop esi - jnz pnp_add - - mov edi, esi - - /* Calculate the bios entry point (far pointer) */ - xor eax, eax - mov ax, [esi + HEX(0F)] - shl eax, 16 - mov ax, [esi + HEX(0D)] - mov dword ptr ds:[BSS_PnpBiosEntryPoint], eax - - /* Store bios data segment */ - mov ax, [esi + HEX(1B)] - mov word ptr ds:[BSS_PnpBiosDataSegment], ax - -pnp_not_found: - mov eax, edi - - pop edx - pop ecx - pop esi - pop edi - - ret - - -/* - * U32 PnpBiosGetDeviceNodeCount(U32 *NodeSize, U32 *NodeCount); - * - * RETURNS: - */ -PUBLIC _PnpBiosGetDeviceNodeCount -_PnpBiosGetDeviceNodeCount: - - push ebp - mov ebp, esp - - pusha - push es - - mov bx, FNID_PnpBiosGetDeviceNodeCount - call i386CallRealMode - - mov esi, [ebp + 8] - mov ax, [BSS_PnpNodeSize] - movzx ecx, ax - mov [esi], ecx - - mov esi, [ebp + 12] - mov ax, [BSS_PnpNodeCount] - movzx ecx, ax - mov [esi], ecx - - pop es - popa - - mov esp, ebp - pop ebp - - mov eax, dword ptr [BSS_PnpResult] - - ret - - -/* - * U32 PnpBiosGetDeviceNode(U8 *NodeId, U8 *NodeBuffer); - * - * RETURNS: - */ -PUBLIC _PnpBiosGetDeviceNode -_PnpBiosGetDeviceNode: - - push ebp - mov ebp, esp - - pusha - push es - - /* get current node number */ - mov esi, [ebp + 8] - mov al, [esi] - mov byte ptr ds:[BSS_PnpNodeNumber], al - - /* convert pointer to node buffer to segment/offset */ - mov eax, [ebp + 12] - shr eax, 4 - and eax, HEX(0f000) - mov word ptr ds:[BSS_PnpBiosBufferSegment], ax - mov eax, [ebp + 12] - and eax, HEX(0ffff) - mov word ptr ds:[BSS_PnpBiosBufferOffset], ax - - mov bx, FNID_PnpBiosGetDeviceNode - call i386CallRealMode - - /* update node number */ - mov esi, [ebp + 8] - mov al, byte ptr ds:[BSS_PnpNodeNumber] - mov [esi], al - - pop es - popa - - mov esp, ebp - pop ebp - - mov eax, [BSS_PnpResult] - - ret - -END - -/* EOF */ Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S (from r70708, trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] Thu Feb 11 22:33:03 2016 @@ -21,80 +21,10 @@ #include <arch/pc/x86common.h> #include <arch/pc/pcbios.h> -EXTERN _BootMain:PROC -EXTERN _InitIdt:PROC -EXTERN _i386Idt:DWORD -//EXTERN _i386idtptr:FWORD - .code32 -PUBLIC _RealEntryPoint -_RealEntryPoint: - - /* Setup segment selectors */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Setup protected mode stack */ - mov esp, dword ptr ds:[stack32] - - /* Load the IDT */ -#ifdef _USE_ML - lidt fword ptr ds:[i386idtptr] -#else - lidt i386idtptr -#endif - - /* Continue execution */ - jmp dword ptr ds:[ContinueAddress] - -ContinueAddress: - .long _FrldrStartup - - -_FrldrStartup: - - /* Store BootDrive and BootPartition */ - mov byte ptr ds:[_FrldrBootDrive], dl - xor eax, eax - mov al, dh - mov dword ptr ds:[_FrldrBootPartition], eax - - /* Patch long jump with real mode entry point */ - mov eax, dword ptr ds:[BSS_RealModeEntry] - mov dword ptr ds:[SwitchToReal16Address], eax - - /* Initialize the idt */ - call _InitIdt - -#ifndef _USE_ML - /* Clean out bss */ - xor eax, eax - mov edi, offset __bss_start__ - mov ecx, offset __bss_end__ + 3 - sub ecx, edi - shr ecx, 2 - rep stosd - - /* Pass the command line to BootMain */ - mov eax, offset cmdline -#else - xor eax, eax -#endif - - /* GO! */ - push eax - call _BootMain - - /* We should never get here */ -stop: - jmp stop - nop - nop +EXTERN SwitchToReal:PROC +EXTERN ContinueAddress:DWORD Int386_regsin: .long 0 @@ -150,160 +80,4 @@ pop ds ret - -/* - * U16 PxeCallApi(U16 Segment, U16 Offset, U16 Service, VOID *Parameter); - * - * RETURNS: - */ -PUBLIC _PxeCallApi -_PxeCallApi: - /* copy entry point */ - mov eax, [esp + 4] - shl eax, 16 - mov ax, [esp + 8] - mov dword ptr ds:[BSS_PxeEntryPoint], eax - - /* copy function */ - mov ax, [esp + 12] - mov word ptr ds:[BSS_PxeFunction], ax - - /* convert pointer to data buffer to segment/offset */ - mov eax, [esp + 16] - shr eax, 4 - and eax, HEX(0f000) - mov word ptr ds:[BSS_PxeBufferSegment], ax - mov eax, [esp + 16] - and eax, HEX(0ffff) - mov word ptr ds:[BSS_PxeBufferOffset], ax - - pusha - - /* Set the function ID and call realmode */ - mov bx, FNID_PxeCallApi - call i386CallRealMode - - popa - - mov ax, word ptr [BSS_PxeResult] - - ret - - -PUBLIC _Reboot -_Reboot: - /* Set the function ID */ - mov bx, FNID_Reboot - - /*Switch to real mode (We don't return) */ - jmp SwitchToReal - - -PUBLIC _ChainLoadBiosBootSectorCode -_ChainLoadBiosBootSectorCode: - /* Set the boot drive */ - mov dl, byte ptr [_FrldrBootDrive] - - /* Set the function ID */ - mov bx, FNID_ChainLoadBiosBootSectorCode - - /*Switch to real mode (We don't return) */ - jmp SwitchToReal - - -PUBLIC i386CallRealMode -i386CallRealMode: - /* Set continue address and switch to real mode */ - mov dword ptr [ContinueAddress], offset i386CallRealMode_return - jmp SwitchToReal -i386CallRealMode_return: - ret - - -/* Entrypoint for realmode function calls - * ContinueAddress must be set to the return point from realmode - * bx must be set to the ID of the realmode function to call. */ -SwitchToReal: - /* Set sane segments */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Save 32-bit stack pointer */ - mov dword ptr [stack32], esp - - /* jmp to 16-bit segment to set the limit correctly */ - .byte HEX(0ea) // jmp far RMODE_CS:switch_to_real16 -SwitchToReal16Address: - .long 0 // receives address of switch_to_real16 - .word RMODE_CS - nop - - - /* 16-bit stack pointer */ -stack16: - .word STACK16ADDR - - /* 32-bit stack pointer */ -stack32: - .long STACKADDR - - .align 4 /* force 4-byte alignment */ -gdt: - /* NULL Descriptor */ - .word HEX(0000) - .word HEX(0000) - .word HEX(0000) - .word HEX(0000) - - /* 32-bit flat CS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9A00) - .word HEX(00CF) - - /* 32-bit flat DS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9200) - .word HEX(00CF) - - /* 16-bit real mode CS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9E00) - .word HEX(0000) - - /* 16-bit real mode DS */ - .word HEX(FFFF) - .word HEX(0000) - .word HEX(9200) - .word HEX(0000) - -/* GDT table pointer */ -gdtptr: - .word HEX(27) /* Limit */ - .long gdt /* Base Address */ - -/* Real-mode IDT pointer */ -rmode_idtptr: - .word HEX(3ff) /* Limit */ - .long 0 /* Base Address */ - -PUBLIC i386idtptr -i386idtptr: - .word 255 /* Limit */ - .long _i386Idt /* Base Address */ - -PUBLIC _FrldrBootDrive -_FrldrBootDrive: - .byte 0 - -PUBLIC _FrldrBootPartition -_FrldrBootPartition: - .long 0 - END

8 years, 9 months

[ekohl] 70708: [USERINIT] Make the language selection work as expected.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Feb 11 20:00:46 2016 New Revision: 70708 URL: http://svn.reactos.org/svn/reactos?rev=70708&view=rev Log: [USERINIT] Make the language selection work as expected. Modified: trunk/reactos/base/system/userinit/livecd.c trunk/reactos/base/system/userinit/userinit.h Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Thu Feb 11 20:00:46 2016 @@ -402,7 +402,7 @@ if (NewLcid == (LCID)CB_ERR) break; - SetThreadLocale(NewLcid); + NtSetDefaultLocale(TRUE, NewLcid); InitializeDefaultUserLocale(&NewLcid); } Modified: trunk/reactos/base/system/userinit/userinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.h [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.h [iso-8859-1] Thu Feb 11 20:00:46 2016 @@ -20,6 +20,8 @@ #include <undocuser.h> #include <winnls.h> #include <stdio.h> + +#include <ndk/exfuncs.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(userinit);

8 years, 9 months

[hbelusca] 70707: [CMLIB]: Implement CmpFreeSecurityDescriptor. See r70609. CORE-10793 CORE-10796

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 10 22:28:12 2016 New Revision: 70707 URL: http://svn.reactos.org/svn/reactos?rev=70707&view=rev Log: [CMLIB]: Implement CmpFreeSecurityDescriptor. See r70609. CORE-10793 CORE-10796 Added: trunk/reactos/lib/cmlib/cmse.c (with props) Modified: trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cmlib/cmkeydel.c trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Wed Feb 10 22:28:12 2016 @@ -8,6 +8,7 @@ cmindex.c cmkeydel.c cmname.c + cmse.c cmvalue.c hivebin.c hivecell.c Modified: trunk/reactos/lib/cmlib/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Wed Feb 10 22:28:12 2016 @@ -220,8 +220,8 @@ HvFreeCell(Hive, CellData->ValueList.List); } - /* FIXME: This leaks the security desriptor! */ - DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); + /* Free the key security descriptor */ + CmpFreeSecurityDescriptor(Hive, Cell); } /* Free the key body itself, and then return our status */ Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7070… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Wed Feb 10 22:28:12 2016 @@ -676,7 +676,21 @@ CmpFreeKeyByCell( IN PHHIVE Hive, IN HCELL_INDEX Cell, - IN BOOLEAN Unlink + IN BOOLEAN Unlink +); + +VOID +NTAPI +CmpRemoveSecurityCellList( + IN PHHIVE Hive, + IN HCELL_INDEX SecurityCell +); + +VOID +NTAPI +CmpFreeSecurityDescriptor( + IN PHHIVE Hive, + IN HCELL_INDEX Cell ); /******************************************************************************/ Added: trunk/reactos/lib/cmlib/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmse.c?rev=70707 ============================================================================== --- trunk/reactos/lib/cmlib/cmse.c (added) +++ trunk/reactos/lib/cmlib/cmse.c [iso-8859-1] Wed Feb 10 22:28:12 2016 @@ -0,0 +1,114 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/cmlib/cmse.c + * PURPOSE: Configuration Manager Library - Security Subsystem Interface + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES ******************************************************************/ + +#include "cmlib.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpRemoveSecurityCellList(IN PHHIVE Hive, + IN HCELL_INDEX SecurityCell) +{ + PCM_KEY_SECURITY SecurityData, FlinkCell, BlinkCell; + + PAGED_CODE(); + + // ASSERT( (((PCMHIVE)Hive)->HiveSecurityLockOwner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive() == TRUE) ); + + SecurityData = HvGetCell(Hive, SecurityCell); + if (!SecurityData) return; + + FlinkCell = HvGetCell(Hive, SecurityData->Flink); + if (!FlinkCell) + { + HvReleaseCell(Hive, SecurityCell); + return; + } + + BlinkCell = HvGetCell(Hive, SecurityData->Blink); + if (!BlinkCell) + { + HvReleaseCell(Hive, SecurityData->Flink); + HvReleaseCell(Hive, SecurityCell); + return; + } + + /* Sanity checks */ + ASSERT(FlinkCell->Blink == SecurityCell); + ASSERT(BlinkCell->Flink == SecurityCell); + + /* Unlink the security block and free it */ + FlinkCell->Blink = SecurityData->Blink; + BlinkCell->Flink = SecurityData->Flink; +#ifdef USE_CM_CACHE + CmpRemoveFromSecurityCache(Hive, SecurityCell); +#endif + + /* Release the cells */ + HvReleaseCell(Hive, SecurityData->Blink); + HvReleaseCell(Hive, SecurityData->Flink); + HvReleaseCell(Hive, SecurityCell); +} + +VOID +NTAPI +CmpFreeSecurityDescriptor(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCM_KEY_NODE CellData; + PCM_KEY_SECURITY SecurityData; + + PAGED_CODE(); + + // ASSERT( (((PCMHIVE)Hive)->HiveSecurityLockOwner == KeGetCurrentThread()) || (CmpTestRegistryLockExclusive() == TRUE) ); + + CellData = HvGetCell(Hive, Cell); + if (!CellData) return; + + ASSERT(CellData->Signature == CM_KEY_NODE_SIGNATURE); + + // FIXME: ReactOS-specific: check whether this key has a security block. + // On Windows there is no such check, all keys seem to have a valid + // security block. + // If we remove this check on ReactOS (and continue running) then we get + // a BSOD at the end... + if (CellData->Security == HCELL_NIL) + { + DPRINT1("Cell 0x%08x (data 0x%p) has no security block!\n", Cell, CellData); + HvReleaseCell(Hive, Cell); + return; + } + + SecurityData = HvGetCell(Hive, CellData->Security); + if (!SecurityData) + { + HvReleaseCell(Hive, Cell); + return; + } + + ASSERT(SecurityData->Signature == CM_KEY_SECURITY_SIGNATURE); + + if (SecurityData->ReferenceCount > 1) + { + SecurityData->ReferenceCount--; + } + else // if (SecurityData->ReferenceCount <= 1) + { + CmpRemoveSecurityCellList(Hive, CellData->Security); + HvFreeCell(Hive, CellData->Security); + } + + CellData->Security = HCELL_NIL; + HvReleaseCell(Hive, CellData->Security); + HvReleaseCell(Hive, Cell); +} Propchange: trunk/reactos/lib/cmlib/cmse.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[hbelusca] 70706: [CMLIB] - Fix some comments. - Simplify code. - Add a missing check for hive exit nodes when deleting cells.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 10 22:18:20 2016 New Revision: 70706 URL: http://svn.reactos.org/svn/reactos?rev=70706&view=rev Log: [CMLIB] - Fix some comments. - Simplify code. - Add a missing check for hive exit nodes when deleting cells. Modified: trunk/reactos/lib/cmlib/cmkeydel.c Modified: trunk/reactos/lib/cmlib/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Wed Feb 10 22:18:20 2016 @@ -20,7 +20,9 @@ IN HCELL_INDEX Cell, IN BOOLEAN CheckNoSubkeys) { - PCELL_DATA CellData, ListData, SecurityData, ValueData; + PCM_KEY_NODE CellData; + PCM_KEY_SECURITY SecurityData; + PCELL_DATA ListData, ValueData; ULONG i; /* Get the cell data for our target */ @@ -31,12 +33,12 @@ if (CheckNoSubkeys) { /* Do them */ - ASSERT(CellData->u.KeyNode.SubKeyCounts[Stable] == 0); - ASSERT(CellData->u.KeyNode.SubKeyCounts[Volatile] == 0); - } - - /* If this is an exit hive, there's nothing to do */ - if (CellData->u.KeyNode.Flags & KEY_HIVE_EXIT) + ASSERT(CellData->SubKeyCounts[Stable] == 0); + ASSERT(CellData->SubKeyCounts[Volatile] == 0); + } + + /* If this is an exit node, there's nothing to do */ + if (CellData->Flags & KEY_HIVE_EXIT) { /* Release the cell and get out */ HvReleaseCell(Hive, Cell); @@ -48,41 +50,42 @@ HvReleaseCell(Hive, Cell); /* Check if we have a class */ - if (CellData->u.KeyNode.Class != HCELL_NIL) + if (CellData->Class != HCELL_NIL) { /* Mark it dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Class, FALSE); + HvMarkCellDirty(Hive, CellData->Class, FALSE); } /* Check if we have security */ - if (CellData->u.KeyNode.Security != HCELL_NIL) + if (CellData->Security != HCELL_NIL) { /* Mark it dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Security, FALSE); + HvMarkCellDirty(Hive, CellData->Security, FALSE); /* Get the security data and release it */ - SecurityData = HvGetCell(Hive, CellData->u.KeyNode.Security); + SecurityData = HvGetCell(Hive, CellData->Security); if (!SecurityData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.Security); + HvReleaseCell(Hive, CellData->Security); /* Mark the security links dirty too */ - HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Flink, FALSE); - HvMarkCellDirty(Hive, SecurityData->u.KeySecurity.Blink, FALSE); - } - + HvMarkCellDirty(Hive, SecurityData->Flink, FALSE); + HvMarkCellDirty(Hive, SecurityData->Blink, FALSE); + } + + // TODO: Handle predefined keys (Flags: KEY_PREDEF_HANDLE) /* Check if we have any values */ - if (CellData->u.KeyNode.ValueList.Count > 0) + if (CellData->ValueList.Count > 0) { /* Dirty the value list */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.ValueList.List, FALSE); + HvMarkCellDirty(Hive, CellData->ValueList.List, FALSE); /* Get the list data itself, and release it */ - ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); + ListData = HvGetCell(Hive, CellData->ValueList.List); if (!ListData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); + HvReleaseCell(Hive, CellData->ValueList.List); /* Loop all values */ - for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) + for (i = 0; i < CellData->ValueList.Count; i++) { /* Dirty each value */ HvMarkCellDirty(Hive, ListData->u.KeyList[i], FALSE); @@ -101,18 +104,18 @@ } } - /* If this is an entry hive, we're done */ - if (CellData->u.KeyNode.Flags & KEY_HIVE_ENTRY) return TRUE; + /* If this is an entry node, we're done */ + if (CellData->Flags & KEY_HIVE_ENTRY) return TRUE; /* Otherwise mark the index dirty too */ - if (!CmpMarkIndexDirty(Hive, CellData->u.KeyNode.Parent, Cell)) + if (!CmpMarkIndexDirty(Hive, CellData->Parent, Cell)) { /* Failure */ return FALSE; } /* Finally, mark the parent dirty */ - HvMarkCellDirty(Hive, CellData->u.KeyNode.Parent, FALSE); + HvMarkCellDirty(Hive, CellData->Parent, FALSE); return TRUE; } @@ -121,27 +124,27 @@ CmpFreeKeyBody(IN PHHIVE Hive, IN HCELL_INDEX Cell) { - PCELL_DATA CellData; + PCM_KEY_NODE CellData; /* Get the key node */ CellData = HvGetCell(Hive, Cell); if (!CellData) ASSERT(FALSE); /* Check if we can delete the child cells */ - if (!(CellData->u.KeyNode.Flags & KEY_HIVE_EXIT)) + if (!(CellData->Flags & KEY_HIVE_EXIT)) { /* Check if we have a security cell */ - if (CellData->u.KeyNode.Security != HCELL_NIL) + if (CellData->Security != HCELL_NIL) { /* Free the security cell */ - HvFreeCell(Hive, CellData->u.KeyNode.Security); + HvFreeCell(Hive, CellData->Security); } /* Check if we have a class */ - if (CellData->u.KeyNode.ClassLength > 0) + if (CellData->ClassLength > 0) { /* Free it */ - HvFreeCell(Hive, CellData->u.KeyNode.Class); + HvFreeCell(Hive, CellData->Class); } } @@ -157,12 +160,13 @@ IN HCELL_INDEX Cell, IN BOOLEAN Unlink) { - PCELL_DATA CellData, ParentData, ListData; + PCM_KEY_NODE CellData, ParentData; + PCELL_DATA ListData; ULONG i; BOOLEAN Result; /* Mark the entire key dirty */ - CmpMarkKeyDirty(Hive, Cell ,TRUE); + CmpMarkKeyDirty(Hive, Cell, TRUE); /* Get the target node and release it */ CellData = HvGetCell(Hive, Cell); @@ -170,52 +174,55 @@ HvReleaseCell(Hive, Cell); /* Make sure we don't have subkeys */ - ASSERT((CellData->u.KeyNode.SubKeyCounts[Stable] + - CellData->u.KeyNode.SubKeyCounts[Volatile]) == 0); + ASSERT(CellData->SubKeyCounts[Stable] + CellData->SubKeyCounts[Volatile] == 0); /* Check if we have to unlink */ if (Unlink) { /* Remove the subkey */ - Result = CmpRemoveSubKey(Hive, CellData->u.KeyNode.Parent, Cell); + Result = CmpRemoveSubKey(Hive, CellData->Parent, Cell); if (!Result) return STATUS_INSUFFICIENT_RESOURCES; /* Get the parent node and release it */ - ParentData = HvGetCell(Hive, CellData->u.KeyNode.Parent); + ParentData = HvGetCell(Hive, CellData->Parent); if (!ParentData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.Parent); + HvReleaseCell(Hive, CellData->Parent); /* Check if the parent node has no more subkeys */ - if (!(ParentData->u.KeyNode.SubKeyCounts[Stable] + - ParentData->u.KeyNode.SubKeyCounts[Volatile])) + if (ParentData->SubKeyCounts[Stable] + ParentData->SubKeyCounts[Volatile] == 0) { /* Then free the cached name/class lengths */ - ParentData->u.KeyNode.MaxNameLen = 0; - ParentData->u.KeyNode.MaxClassLen = 0; - } - } - - /* Check if we have any values */ - if (CellData->u.KeyNode.ValueList.Count > 0) - { - /* Get the value list and release it */ - ListData = HvGetCell(Hive, CellData->u.KeyNode.ValueList.List); - if (!ListData) ASSERT(FALSE); - HvReleaseCell(Hive, CellData->u.KeyNode.ValueList.List); - - /* Loop every value */ - for (i = 0; i < CellData->u.KeyNode.ValueList.Count; i++) - { - /* Free it */ - if (!CmpFreeValue(Hive, ListData->u.KeyList[i])) ASSERT(FALSE); - } - - /* Free the value list */ - HvFreeCell(Hive, CellData->u.KeyNode.ValueList.List); - } - - /* FIXME: This leaks the security desriptor! */ - DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); + ParentData->MaxNameLen = 0; + ParentData->MaxClassLen = 0; + } + } + + // TODO: Handle predefined keys (Flags: KEY_PREDEF_HANDLE) + /* If this is an exit node, we don't have values */ + if (!(CellData->Flags & KEY_HIVE_EXIT)) + { + /* Check if we have any values */ + if (CellData->ValueList.Count > 0) + { + /* Get the value list and release it */ + ListData = HvGetCell(Hive, CellData->ValueList.List); + if (!ListData) ASSERT(FALSE); + HvReleaseCell(Hive, CellData->ValueList.List); + + /* Loop every value */ + for (i = 0; i < CellData->ValueList.Count; i++) + { + /* Free it */ + if (!CmpFreeValue(Hive, ListData->u.KeyList[i])) ASSERT(FALSE); + } + + /* Free the value list */ + HvFreeCell(Hive, CellData->ValueList.List); + } + + /* FIXME: This leaks the security desriptor! */ + DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); + } /* Free the key body itself, and then return our status */ if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES;

8 years, 9 months

[hbelusca] 70705: [CMLIB]: fix a typo in the constant name.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Feb 10 22:04:57 2016 New Revision: 70705 URL: http://svn.reactos.org/svn/reactos?rev=70705&view=rev Log: [CMLIB]: fix a typo in the constant name. Modified: trunk/reactos/lib/cmlib/cmdata.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=707… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Wed Feb 10 22:04:57 2016 @@ -33,7 +33,7 @@ #define KEY_NO_DELETE 0x0008 #define KEY_SYM_LINK 0x0010 #define KEY_COMP_NAME 0x0020 -#define KEY_PREFEF_HANDLE 0x0040 +#define KEY_PREDEF_HANDLE 0x0040 #define KEY_VIRT_MIRRORED 0x0080 #define KEY_VIRT_TARGET 0x0100 #define KEY_VIRTUAL_STORE 0x0200

8 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
16
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 February 2016