Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 60809: - Fix build
by jimtabor＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: jimtabor Date: Thu Oct 31 17:21:04 2013 New Revision: 60809 URL: http://svn.reactos.org/svn/reactos?rev=60809&view=rev Log: - Fix build Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Oct 31 17:21:04 2013 @@ -14356,7 +14356,10 @@ test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); -// test_interthread_messages(); ReactOS ActivateActCtx seems to be broken. + if(!winetest_interactive) + skip("ReactOS ActivateActCtx seems to be broken.\n"); + else + test_interthread_messages(); test_message_conversion(); test_accelerators(); test_timers();

1 0

[jimtabor] 60808: - ActivateActCtx seems to be broken, skip test.
by jimtabor＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: jimtabor Date: Thu Oct 31 17:15:49 2013 New Revision: 60808 URL: http://svn.reactos.org/svn/reactos?rev=60808&view=rev Log: - ActivateActCtx seems to be broken, skip test. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Oct 31 17:15:49 2013 @@ -14356,7 +14356,7 @@ test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); - test_interthread_messages(); +// test_interthread_messages(); ReactOS ActivateActCtx seems to be broken. test_message_conversion(); test_accelerators(); test_timers();

1 0

[jimtabor] 60807: - Fix Text tests. Update wine sync.
by jimtabor＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: jimtabor Date: Thu Oct 31 16:54:01 2013 New Revision: 60807 URL: http://svn.reactos.org/svn/reactos?rev=60807&view=rev Log: - Fix Text tests. Update wine sync. Modified: trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Thu Oct 31 16:54:01 2013 @@ -32,6 +32,9 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(text); + +DWORD WINAPI GdiGetCodePage(HDC hdc); + /* FUNCTIONS *****************************************************************/ @@ -71,14 +74,13 @@ LONG ret; DWORD len; LPWSTR strW; - - len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); + UINT cp = GdiGetCodePage( hDC ); // CP_ACP + + len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + if (!len) return 0; strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!strW) - { - return 0; - } - MultiByteToWideChar(CP_ACP, 0, lpString, nCount, strW, len); + if (!strW) return 0; + MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); ret = TabbedTextOutW(hDC, X, Y, strW, len, nTabPositions, lpnTabStopPositions, nTabOrigin); HeapFree(GetProcessHeap(), 0, strW); return ret; @@ -215,20 +217,16 @@ CONST INT *lpnTabStopPositions) { LONG ret; - DWORD len = MultiByteToWideChar(CP_ACP, 0, lpString, nCount, NULL, 0); + UINT cp = GdiGetCodePage( hDC ); // CP_ACP + DWORD len = MultiByteToWideChar(cp, 0, lpString, nCount, NULL, 0); + if (!len) return 0; LPWSTR strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if (!strW) - return 0; - MultiByteToWideChar(CP_ACP, 0, lpString, nCount, strW, len); - - ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, - lpnTabStopPositions); - + if (!strW) return 0; + MultiByteToWideChar(cp, 0, lpString, nCount, strW, len); + ret = GetTabbedTextExtentW(hDC, strW, len, nTabPositions, lpnTabStopPositions); HeapFree(GetProcessHeap(), 0, strW); return ret; } - /* * @implemented @@ -293,6 +291,8 @@ #define CR 13 #define SPACE 32 #define PREFIX 38 +#define ALPHA_PREFIX 30 /* Win16: Alphabet prefix */ +#define KANA_PREFIX 31 /* Win16: Katakana prefix */ #define FORWARD_SLASH '/' #define BACK_SLASH '\\' @@ -711,8 +711,9 @@ max -= n; while (n--) { - if (*start_str++ == PREFIX && max--) + if ((*start_str == PREFIX || *start_str == ALPHA_PREFIX) && max--) start_str++; + start_str++; } start_count -= (start_str - str_on_entry); } @@ -746,10 +747,10 @@ const ellipsis_data *pe) { int result = -1; - unsigned int i = 0; + unsigned int i; unsigned int n = pe->before + pe->under + pe->after; assert (n <= ns); - while (i < n) + for (i = 0; i < n; i++, str++) { if (i == (unsigned int) pe->before) { @@ -762,16 +763,15 @@ } if (!ns) break; ns--; - if (*str++ == PREFIX) - { + if (*str++ == PREFIX || *str == ALPHA_PREFIX) + { + str++; if (!ns) break; if (*str != PREFIX) result = (i < (unsigned int) pe->before || pe->under == 0) ? i : i - pe->under + pe->len; /* pe->len may be non-zero while pe_under is zero */ - str++; ns--; } - i++; } return result; } @@ -870,8 +870,13 @@ (str[i] != TAB || !(format & DT_EXPANDTABS)) && ((str[i] != CR && str[i] != LF) || (format & DT_SINGLELINE))) { - if (str[i] == PREFIX && !(format & DT_NOPREFIX) && *count > 1) + if ((format & DT_NOPREFIX) || *count <= 1) { + (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++; + continue; + } + + if (str[i] == PREFIX || str[i] == ALPHA_PREFIX) { (*count)--, i++; /* Throw away the prefix itself */ if (str[i] == PREFIX) { @@ -887,6 +892,12 @@ * one. */ } + else if (str[i] == KANA_PREFIX) + { + /* Throw away katakana access keys */ + (*count)--, i++; /* skip the prefix */ + (*count)--, i++; /* skip the letter */ + } else { (*count)--; if (j < maxl) dest[j++] = str[i++]; else i++; @@ -1283,10 +1294,6 @@ } return y - rect->top; } - -DWORD -WINAPI -GdiGetCodePage(HDC hdc); /*********************************************************************** * DrawTextExA (USER32.@)

1 0

[jimtabor] 60806: - Add message type to debug.
by jimtabor＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: jimtabor Date: Thu Oct 31 16:52:18 2013 New Revision: 60806 URL: http://svn.reactos.org/svn/reactos?rev=60806&view=rev Log: - Add message type to debug. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Thu Oct 31 16:52:18 2013 @@ -334,7 +334,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Failed to copy result from user mode!\n"); + ERR("Failed to copy result from user mode Message %d!\n", Message); Status = _SEH2_GetExceptionCode(); } _SEH2_END;

1 0

[tfaber] 60805: [SHELL32] - Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell CORE-4771
by tfaber＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: tfaber Date: Thu Oct 31 16:46:14 2013 New Revision: 60805 URL: http://svn.reactos.org/svn/reactos?rev=60805&view=rev Log: [SHELL32] - Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell CORE-4771 Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/fs.cpp Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Thu Oct 31 16:46:14 2013 @@ -1283,14 +1283,16 @@ } op.pTo = szTargetPath; + op.fFlags = 0; } else { op.pTo = pszTargetList; + op.fFlags = FOF_MULTIDESTFILES; } op.hwnd = GetActiveWindow(); op.wFunc = FO_COPY; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; res = SHFileOperationW(&op); Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Thu Oct 31 16:46:14 2013 @@ -1124,14 +1124,16 @@ } op.pTo = szTargetPath; + op.fFlags = 0; } else { op.pTo = pszTargetList; + op.fFlags = FOF_MULTIDESTFILES; } op.hwnd = GetActiveWindow(); op.wFunc = FO_COPY; - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; res = SHFileOperationW(&op);

1 0

[tfaber] 60804: [SHELL32] - Handle invalid cbSize in Shell_NotifyIcon[AW]. Patch by Ivan Rodionov. - Use FIELD_OFFSET for variable-length structure CORE-7164
by tfaber＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: tfaber Date: Thu Oct 31 16:21:57 2013 New Revision: 60804 URL: http://svn.reactos.org/svn/reactos?rev=60804&view=rev Log: [SHELL32] - Handle invalid cbSize in Shell_NotifyIcon[AW]. Patch by Ivan Rodionov. - Use FIELD_OFFSET for variable-length structure CORE-7164 Modified: trunk/reactos/dll/win32/shell32/systray.cpp Modified: trunk/reactos/dll/win32/shell32/systray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.cpp [iso-8859-1] Thu Oct 31 16:21:57 2013 @@ -21,6 +21,8 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(shell); + /* copy data structure for tray notifications */ typedef struct TrayNotifyCDS_Dummy { DWORD cookie; @@ -29,13 +31,13 @@ } TrayNotifyCDS_Dummy; /* The only difference between Shell_NotifyIconA and Shell_NotifyIconW is the call to SendMessageA/W. */ -static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, int nid_size, BOOL unicode) +static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, DWORD nid_size, BOOL unicode) { HWND hwnd; COPYDATASTRUCT data; BOOL ret = FALSE; - int len = sizeof(TrayNotifyCDS_Dummy) - sizeof(DWORD) + nid_size; + int len = FIELD_OFFSET(TrayNotifyCDS_Dummy, nicon_data) + nid_size; TrayNotifyCDS_Dummy* pnotify_data = (TrayNotifyCDS_Dummy*) alloca(len); @@ -61,7 +63,21 @@ */ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, FALSE); + DWORD cbSize; + + /* Validate the cbSize as Windows XP does */ + if (pnid->cbSize != NOTIFYICONDATAA_V1_SIZE && + pnid->cbSize != NOTIFYICONDATAA_V2_SIZE && + pnid->cbSize != sizeof(NOTIFYICONDATAA)) + { + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + pnid->cbSize, NOTIFYICONDATAA_V1_SIZE); + cbSize = NOTIFYICONDATAA_V1_SIZE; + } + else + cbSize = pnid->cbSize; + + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, FALSE); } /************************************************************************* @@ -69,5 +85,19 @@ */ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) { - return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, pnid->cbSize, TRUE); + DWORD cbSize; + + /* Validate the cbSize so that WM_COPYDATA doesn't crash the application */ + if (pnid->cbSize != NOTIFYICONDATAW_V1_SIZE && + pnid->cbSize != NOTIFYICONDATAW_V2_SIZE && + pnid->cbSize != sizeof(NOTIFYICONDATAW)) + { + WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + pnid->cbSize, NOTIFYICONDATAW_V1_SIZE); + cbSize = NOTIFYICONDATAA_V1_SIZE; + } + else + cbSize = pnid->cbSize; + + return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, TRUE); }

1 0

[tfaber] 60803: [CMAKE] - Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by David Quintana - Use subsystem version 5.02 for x64, because 5.01 doesn't exist CORE-7...
by tfaber＠svn.reactos.org 31 Oct '13

31 Oct '13

Author: tfaber Date: Thu Oct 31 09:59:55 2013 New Revision: 60803 URL: http://svn.reactos.org/svn/reactos?rev=60803&view=rev Log: [CMAKE] - Add /FS to VS 2013 build to fix issues with concurrent access to PDB files. Patch by David Quintana - Use subsystem version 5.02 for x64, because 5.01 doesn't exist CORE-7434 #resolve Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60803… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Oct 31 09:59:55 2013 @@ -24,8 +24,13 @@ # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 -if (MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") +if(MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") +endif () + +# VS 12+ requires /FS when used in parallel compilations +if(MSVC_VERSION GREATER 1799 AND NOT MSVC_IDE) + add_compile_flags("/FS") endif () # C++ exception specification ignored... yeah we don't care @@ -111,7 +116,11 @@ function(set_subsystem MODULE SUBSYSTEM) if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17) - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + if(ARCH STREQUAL "amd64") + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.02") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.01") + endif() else() add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") endif()

1 0

[pschweitzer] 60802: [NTOSKRNL] Implement MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. These are responsible for marking the control area that we've loaded the symbols and for effectively l...
by pschweitzer＠svn.reactos.org 30 Oct '13

30 Oct '13

Author: pschweitzer Date: Wed Oct 30 23:17:08 2013 New Revision: 60802 URL: http://svn.reactos.org/svn/reactos?rev=60802&view=rev Log: [NTOSKRNL] Implement MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. These are responsible for marking the control area that we've loaded the symbols and for effectively loading the symbols. These two functions only apply on image section! (ie, ControlArea->u.Flags.Image not null). They are only compatible with ARM3. But, for the moment, old MM is responsible for image section mapping and thus, these two functions cannot be used. Once this responsibility is transfered to ARM3, first call MiCacheImageSymbols, if successful, then call MiSetControlAreaSymbolsLoaded and MiLoadUserSymbols. After checking image was at base and GlobalMemory was not set. Once this is finally linked, this *should* fix PSAPI apitests. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Oct 30 23:17:08 2013 @@ -1080,6 +1080,116 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiSetControlAreaSymbolsLoaded(IN PCONTROL_AREA ControlArea) +{ + KIRQL OldIrql; + + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + ControlArea->u.Flags.DebugSymbolsLoaded |= 1; + + ASSERT(OldIrql <= APC_LEVEL); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} + +VOID +NTAPI +MiLoadUserSymbols(IN PCONTROL_AREA ControlArea, + IN PVOID BaseAddress, + IN PEPROCESS Process) +{ + NTSTATUS Status; + ANSI_STRING FileNameA; + PLIST_ENTRY NextEntry; + PUNICODE_STRING FileName; + PIMAGE_NT_HEADERS NtHeaders; + PLDR_DATA_TABLE_ENTRY LdrEntry; + + FileName = &ControlArea->FilePointer->FileName; + if (FileName->Length == 0) + { + return; + } + + /* Acquire module list lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&PsLoadedModuleResource, TRUE); + + /* Browse list to try to find current module */ + for (NextEntry = MmLoadedUserImageList.Flink; + NextEntry != &MmLoadedUserImageList; + NextEntry = NextEntry->Flink) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* If already in the list, increase load count */ + if (LdrEntry->DllBase == BaseAddress) + { + ++LdrEntry->LoadCount; + break; + } + } + + /* Not in the list, we'll add it */ + if (NextEntry == &MmLoadedUserImageList) + { + /* Allocate our element, taking to the name string and its null char */ + LdrEntry = ExAllocatePoolWithTag(NonPagedPool, FileName->Length + sizeof(UNICODE_NULL) + sizeof(*LdrEntry), 'bDmM'); + if (LdrEntry) + { + memset(LdrEntry, 0, FileName->Length + sizeof(UNICODE_NULL) + sizeof(*LdrEntry)); + + _SEH2_TRY + { + /* Get image checksum and size */ + NtHeaders = RtlImageNtHeader(BaseAddress); + if (NtHeaders) + { + LdrEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; + LdrEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(NonPagedPool, 'bDmM'); + _SEH2_YIELD(return); + } + _SEH2_END; + + /* Fill all the details */ + LdrEntry->DllBase = BaseAddress; + LdrEntry->FullDllName.Buffer = (PVOID)((ULONG_PTR)LdrEntry + sizeof(*LdrEntry)); + LdrEntry->FullDllName.Length = FileName->Length; + LdrEntry->FullDllName.MaximumLength = FileName->Length + sizeof(UNICODE_NULL); + memcpy(LdrEntry->FullDllName.Buffer, FileName->Buffer, FileName->Length); + LdrEntry->FullDllName.Buffer[LdrEntry->FullDllName.Length / sizeof(WCHAR)] = UNICODE_NULL; + LdrEntry->LoadCount = 1; + + /* Insert! */ + InsertHeadList(&MmLoadedUserImageList, &LdrEntry->InLoadOrderLinks); + } + } + + /* Release locks */ + ExReleaseResourceLite(&PsLoadedModuleResource); + KeLeaveCriticalRegion(); + + /* Load symbols */ + Status = RtlUnicodeStringToAnsiString(&FileNameA, FileName, TRUE); + if (NT_SUCCESS(Status)) + { + DbgLoadImageSymbols(&FileNameA, BaseAddress, (ULONG_PTR)Process); + RtlFreeAnsiString(&FileNameA); + } +} + NTSTATUS NTAPI MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea,

1 0

[aandrejevic] 60801: [NTVDM] Fix an EOI condition in the BIOS IRQ handler.
by aandrejevic＠svn.reactos.org 30 Oct '13

30 Oct '13

Author: aandrejevic Date: Wed Oct 30 22:42:32 2013 New Revision: 60801 URL: http://svn.reactos.org/svn/reactos?rev=60801&view=rev Log: [NTVDM] Fix an EOI condition in the BIOS IRQ handler. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Oct 30 22:42:32 2013 @@ -1170,7 +1170,7 @@ } /* Send End-of-Interrupt to the PIC */ - if (IrqNumber > 8) PicWriteCommand(PIC_SLAVE_CMD, PIC_OCW2_EOI); + if (IrqNumber >= 8) PicWriteCommand(PIC_SLAVE_CMD, PIC_OCW2_EOI); PicWriteCommand(PIC_MASTER_CMD, PIC_OCW2_EOI); }

1 0

[ekohl] 60800: [ADVAPI32] Enable the new SAM-based logon system. Using your own accounts to log-on to ReactOS will still fail because of bugs in winlogon, userenv.dll and the registry. But at least...
by ekohl＠svn.reactos.org 30 Oct '13

30 Oct '13

Author: ekohl Date: Wed Oct 30 21:19:03 2013 New Revision: 60800 URL: http://svn.reactos.org/svn/reactos?rev=60800&view=rev Log: [ADVAPI32] Enable the new SAM-based logon system. Using your own accounts to log-on to ReactOS will still fail because of bugs in winlogon, userenv.dll and the registry. But at least the infrastructure is in place and we can start to fix the reamining bugs. All accounts still use a hard-coded privilege set, but this will be fixed as soon as possible. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Wed Oct 30 21:19:03 2013 @@ -324,7 +324,7 @@ "81d", "125",\ "422", "125",\ "402", "125",\ - "427", "125",\ + "427", "125",\ "408", "130",\ "41f", "130",\ "418", "130",\ @@ -1067,7 +1067,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" +;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" ; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Wed Oct 30 21:19:03 2013 @@ -58,7 +58,7 @@ set_module_type(advapi32 win32dll UNICODE) target_link_libraries(advapi32 wine ${PSEH_LIB}) add_delay_importlibs(advapi32 rpcrt4) -add_importlibs(advapi32 msvcrt kernel32 ntdll) +add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll) add_pch(advapi32 advapi32.h ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Wed Oct 30 21:19:03 2013 @@ -9,6 +9,7 @@ #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); +#define NEW_LOGON /* FUNCTIONS ***************************************************************/ @@ -212,6 +213,7 @@ } +#ifndef NEW_LOGON static BOOL WINAPI GetAccountDomainSid(PSID *Sid) { @@ -565,6 +567,7 @@ RtlFreeHeap(GetProcessHeap(), 0, TokenGroups); } +#endif /* @@ -578,6 +581,196 @@ DWORD dwLogonProvider, PHANDLE phToken) { +#ifdef NEW_LOGON + LSA_STRING LogonProcessName; + LSA_STRING PackageName; + HANDLE LsaHandle = NULL; + LSA_OPERATIONAL_MODE SecurityMode = 0; + ULONG AuthenticationPackage = 0; + + LSA_STRING OriginName; + UNICODE_STRING DomainName; + UNICODE_STRING UserName; + UNICODE_STRING Password; + PMSV1_0_INTERACTIVE_LOGON AuthInfo = NULL; + ULONG AuthInfoLength; + ULONG_PTR Ptr; + TOKEN_SOURCE TokenSource; + + PMSV1_0_INTERACTIVE_PROFILE ProfileBuffer = NULL; + ULONG ProfileBufferLength = 0; + LUID Luid = {0, 0}; + HANDLE TokenHandle = NULL; + QUOTA_LIMITS QuotaLimits; + NTSTATUS SubStatus = STATUS_SUCCESS; + NTSTATUS Status; + + *phToken = NULL; + + RtlInitAnsiString((PANSI_STRING)&LogonProcessName, + "User32LogonProcess"); + + Status = LsaRegisterLogonProcess(&LogonProcessName, + &LsaHandle, + &SecurityMode); + if (!NT_SUCCESS(Status)) + { + TRACE("LsaRegisterLogonProcess failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + TRACE("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + + TRACE("AuthenticationPackage: 0x%08lx\n", AuthenticationPackage); + + + RtlInitAnsiString((PANSI_STRING)&OriginName, + "Testapp"); + + RtlInitUnicodeString(&DomainName, + lpszDomain); + + RtlInitUnicodeString(&UserName, + lpszUsername); + + RtlInitUnicodeString(&Password, + lpszPassword); + + AuthInfoLength = sizeof(MSV1_0_INTERACTIVE_LOGON)+ + DomainName.MaximumLength + + UserName.MaximumLength + + Password.MaximumLength; + + AuthInfo = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + AuthInfoLength); + if (AuthInfo == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + + AuthInfo->MessageType = MsV1_0InteractiveLogon; + + Ptr = (ULONG_PTR)AuthInfo + sizeof(MSV1_0_INTERACTIVE_LOGON); + + AuthInfo->LogonDomainName.Length = DomainName.Length; + AuthInfo->LogonDomainName.MaximumLength = DomainName.MaximumLength; + AuthInfo->LogonDomainName.Buffer = (DomainName.Buffer == NULL) ? NULL : (PWCHAR)Ptr; + if (DomainName.MaximumLength > 0) + { + RtlCopyMemory(AuthInfo->LogonDomainName.Buffer, + DomainName.Buffer, + DomainName.MaximumLength); + + Ptr += DomainName.MaximumLength; + } + + AuthInfo->UserName.Length = UserName.Length; + AuthInfo->UserName.MaximumLength = UserName.MaximumLength; + AuthInfo->UserName.Buffer = (PWCHAR)Ptr; + if (UserName.MaximumLength > 0) + RtlCopyMemory(AuthInfo->UserName.Buffer, + UserName.Buffer, + UserName.MaximumLength); + + Ptr += UserName.MaximumLength; + + AuthInfo->Password.Length = Password.Length; + AuthInfo->Password.MaximumLength = Password.MaximumLength; + AuthInfo->Password.Buffer = (PWCHAR)Ptr; + if (Password.MaximumLength > 0) + RtlCopyMemory(AuthInfo->Password.Buffer, + Password.Buffer, + Password.MaximumLength); + + /* FIXME: Add LocalGroups here */ + + strcpy(TokenSource.SourceName, "Bla"); + AllocateLocallyUniqueId(&TokenSource.SourceIdentifier); + + Status = LsaLogonUser(LsaHandle, + &OriginName, + Interactive, + AuthenticationPackage, + (PVOID)AuthInfo, + AuthInfoLength, + NULL, /* LocalGroups */ + &TokenSource, + (PVOID*)&ProfileBuffer, + &ProfileBufferLength, + &Luid, + &TokenHandle, + &QuotaLimits, + &SubStatus); + if (!NT_SUCCESS(Status)) + { + TRACE("LsaLogonUser failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (ProfileBuffer != NULL) + { + TRACE("ProfileBuffer: %p\n", ProfileBuffer); + TRACE("MessageType: %u\n", ProfileBuffer->MessageType); + + TRACE("FullName: %p\n", ProfileBuffer->FullName.Buffer); + TRACE("FullName: %S\n", ProfileBuffer->FullName.Buffer); + + TRACE("LogonServer: %p\n", ProfileBuffer->LogonServer.Buffer); + TRACE("LogonServer: %S\n", ProfileBuffer->LogonServer.Buffer); + } + + TRACE("Luid: 0x%08lx%08lx\n", Luid.HighPart, Luid.LowPart); + + if (TokenHandle != NULL) + { + TRACE("TokenHandle: %p\n", TokenHandle); + } + + *phToken = TokenHandle; + +done: + if (ProfileBuffer != NULL) + LsaFreeReturnBuffer(ProfileBuffer); + + if (!NT_SUCCESS(Status)) + { + if (TokenHandle != NULL) + CloseHandle(TokenHandle); + } + + if (AuthInfo != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AuthInfo); + + if (LsaHandle != NULL) + { + Status = LsaDeregisterLogonProcess(LsaHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LsaDeregisterLogonProcess failed (Status 0x%08lx)\n", Status); + } + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +#else /* FIXME shouldn't use hard-coded list of privileges */ static struct { @@ -776,6 +969,7 @@ RtlFreeHeap(GetProcessHeap(), 0, UserSid); return NT_SUCCESS(Status); +#endif } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs