Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 73333: [User32] - Fix dialog pop up crash due to loop. - Sync/Port from wine head, not sure about Staging.
by jimtabor＠svn.reactos.org 22 Nov '16

22 Nov '16

Author: jimtabor Date: Tue Nov 22 03:57:48 2016 New Revision: 73333 URL: http://svn.reactos.org/svn/reactos?rev=73333&view=rev Log: [User32] - Fix dialog pop up crash due to loop. - Sync/Port from wine head, not sure about Staging. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Tue Nov 22 03:57:48 2016 @@ -847,10 +847,7 @@ /* Create dialog main window */ - rect.left = rect.top = 0; - rect.right = MulDiv(template.cx, xBaseUnit, 4); - rect.bottom = MulDiv(template.cy, yBaseUnit, 8); - + SetRect(&rect, 0, 0, MulDiv(template.cx, xBaseUnit, 4), MulDiv(template.cy, yBaseUnit, 8)); if (template.style & DS_CONTROL) template.style &= ~(WS_CAPTION|WS_SYSMENU); template.style |= DS_3DLOOK; @@ -926,24 +923,13 @@ * even if dialog has WS_CHILD, but only for modal dialogs, which matched what * Windows does. */ - + while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( owner ); + if (!parent || parent == GetDesktopWindow()) break; + owner = parent; + } ////// Wine'ie babies need to fix your code!!!! CORE-11633 - if ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = owner; - while ((GetWindowLongW( parent, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = GetParent( owner ); - if (!parent || parent == GetDesktopWindow()) - { - parent = NULL; - break; - } - } - } - else - parent = GetAncestor( owner, GA_ROOT ); - if (parent) { owner = parent; @@ -2488,6 +2474,9 @@ LPMSG lpMsg) { INT dlgCode = 0; + + if (!IsWindow( hDlg )) + return FALSE; if (CallMsgFilterW( lpMsg, MSGF_DIALOGBOX )) return TRUE;

1 0

[jimtabor] 73332: [User32] - Patch by Katayama Hirofumi MZ : Improve task switcher's appearance. - Debugged Alt+Esc - Pixel perfect - Implemented "Display Item Shifting" - Added comments.
by jimtabor＠svn.reactos.org 22 Nov '16

22 Nov '16

Author: jimtabor Date: Tue Nov 22 03:54:55 2016 New Revision: 73332 URL: http://svn.reactos.org/svn/reactos?rev=73332&view=rev Log: [User32] - Patch by Katayama Hirofumi MZ : Improve task switcher's appearance. - Debugged Alt+Esc - Pixel perfect - Implemented "Display Item Shifting" - Added comments. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Tue Nov 22 03:54:55 2016 @@ -5,12 +5,36 @@ * PURPOSE: app switching functionality * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * David Quintana (gigaherz(a)gmail.com) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ + +// +// TODO: +// Move to Win32k. +// Add registry support. +// +// + #include <user32.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + +#define DIALOG_MARGIN 8 // margin of dialog contents + +#define CX_ICON 32 // width of icon +#define CY_ICON 32 // height of icon +#define ICON_MARGIN 4 // margin width around an icon + +#define CX_ITEM (CX_ICON + 2 * ICON_MARGIN) +#define CY_ITEM (CY_ICON + 2 * ICON_MARGIN) +#define ITEM_MARGIN 4 // margin width around an item + +#define CX_ITEM_SPACE (CX_ITEM + 2 * ITEM_MARGIN) +#define CY_ITEM_SPACE (CY_ITEM + 2 * ITEM_MARGIN) + +#define CY_TEXT_MARGIN 4 // margin height around text // limit the number of windows shown in the alt-tab window // 120 windows results in (12*40) by (10*40) pixels worth of icons. @@ -35,28 +59,74 @@ int itemsW, itemsH; int totalW, totalH; int xOffset, yOffset; -POINT pt; +POINT ptStart; + +int nShift = 0; + +BOOL Esc = FALSE; + +BOOL CoolSwitch = TRUE; +int CoolSwitchRows = 3; +int CoolSwitchColumns = 7; + +// window style +const DWORD Style = WS_POPUP | WS_BORDER | WS_DISABLED; +const DWORD ExStyle = WS_EX_TOPMOST | WS_EX_DLGMODALFRAME | WS_EX_TOOLWINDOW; + +DWORD wtodw(const WCHAR *psz) +{ + const WCHAR *pch = psz; + DWORD Value = 0; + while ('0' <= *pch && *pch <= '9') + { + Value *= 10; + Value += *pch - L'0'; + } + return Value; +} + +BOOL LoadCoolSwitchSettings(void) +{ + CoolSwitch = TRUE; + CoolSwitchRows = 3; + CoolSwitchColumns = 7; + + // FIXME: load the settings from registry + + TRACE("CoolSwitch: %d\n", CoolSwitch); + TRACE("CoolSwitchRows: %d\n", CoolSwitchRows); + TRACE("CoolSwitchColumns: %d\n", CoolSwitchColumns); + + return TRUE; +} void ResizeAndCenter(HWND hwnd, int width, int height) { + int x, y; + RECT Rect; + int screenwidth = GetSystemMetrics(SM_CXSCREEN); int screenheight = GetSystemMetrics(SM_CYSCREEN); - pt.x = (screenwidth - width) / 2; - pt.y = (screenheight - height) / 2; - - MoveWindow(hwnd, pt.x, pt.y, width, height, FALSE); + x = (screenwidth - width) / 2; + y = (screenheight - height) / 2; + + SetRect(&Rect, x, y, x + width, y + height); + AdjustWindowRectEx(&Rect, Style, FALSE, ExStyle); + + x = Rect.left; + y = Rect.top; + width = Rect.right - Rect.left; + height = Rect.bottom - Rect.top; + MoveWindow(hwnd, x, y, width, height, FALSE); + + ptStart.x = x; + ptStart.y = y; } void MakeWindowActive(HWND hwnd) { - WINDOWPLACEMENT wpl; - - wpl.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(hwnd, &wpl); - - TRACE("GetWindowPlacement wpl.showCmd %d\n",wpl.showCmd); - if (wpl.showCmd == SW_SHOWMINIMIZED) + if (IsIconic(hwnd)) ShowWindowAsync(hwnd, SW_RESTORE); BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? @@ -139,7 +209,7 @@ // If we got to the max number of windows, // we won't be able to add any more - if(windowCount == MAX_WINDOWS) + if(windowCount >= MAX_WINDOWS) return FALSE; return TRUE; @@ -164,17 +234,14 @@ int xPos = LOWORD(lParam); int yPos = HIWORD(lParam); - int xIndex = (xPos - xOffset)/40; - int xOff = (xPos - xOffset)%40; - - int yIndex = (yPos - yOffset)/40; - int yOff = (yPos - yOffset)%40; - - if(xOff > 32 || xIndex > nItems) - return; - - if(yOff > 32 || yIndex > nRows) - return; + int xIndex = (xPos - DIALOG_MARGIN) / CX_ITEM_SPACE; + int yIndex = (yPos - DIALOG_MARGIN) / CY_ITEM_SPACE; + + if (xIndex < 0 || nCols <= xIndex || + yIndex < 0 || nRows <= yIndex) + { + return; + } selectedWindow = (yIndex*nCols) + xIndex; if (message == WM_MOUSEMOVE) @@ -191,63 +258,95 @@ void OnPaint(HWND hWnd) { - HDC dialogDC; - PAINTSTRUCT paint; - RECT cRC, textRC; - int i; - HBRUSH hBrush; - HPEN hPen; - HFONT dcFont; - COLORREF cr; - int nch = GetWindowTextW(windowList[selectedWindow], windowText, _countof(windowText)); - - dialogDC = BeginPaint(hWnd, &paint); - { - GetClientRect(hWnd, &cRC); - FillRect(dialogDC, &cRC, GetSysColorBrush(COLOR_MENU)); - - for(i=0; i< windowCount; i++) - { - HICON hIcon = iconList[i]; - - int xpos = xOffset + 40 * (i % nCols); - int ypos = yOffset + 40 * (i / nCols); - - if (selectedWindow == i) - { - hBrush = GetSysColorBrush(COLOR_HIGHLIGHT); - } - else - { - hBrush = GetSysColorBrush(COLOR_MENU); - } -#if TRUE - cr = GetSysColor(COLOR_BTNTEXT); // doesn't look right! >_< - hPen = CreatePen(PS_DOT, 1, cr); - SelectObject(dialogDC, hPen); - SelectObject(dialogDC, hBrush); - Rectangle(dialogDC, xpos-2, ypos-2, xpos+32+2, ypos+32+2); - DeleteObject(hPen); - // Must NOT destroy the system brush! -#else - RECT rc = { xpos-2, ypos-2, xpos+32+2, ypos+32+2 }; - FillRect(dialogDC, &rc, hBrush); -#endif - DrawIcon(dialogDC, xpos, ypos, hIcon); - } - - dcFont = SelectObject(dialogDC, dialogFont); - SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); - SetBkMode(dialogDC, TRANSPARENT); - - textRC.top = itemsH; - textRC.left = 8; - textRC.right = totalW - 8; - textRC.bottom = totalH - 8; - DrawTextW(dialogDC, windowText, nch, &textRC, DT_CENTER|DT_END_ELLIPSIS); - SelectObject(dialogDC, dcFont); - } - EndPaint(hWnd, &paint); + HDC dialogDC; + PAINTSTRUCT paint; + RECT cRC, textRC; + int i, xPos, yPos, CharCount; + HFONT dcFont; + HICON hIcon; + HPEN hPen; + COLORREF Color; + + // check + if (nCols == 0 || nItems == 0) + return; + + // begin painting + dialogDC = BeginPaint(hWnd, &paint); + if (dialogDC == NULL) + return; + + // fill the client area + GetClientRect(hWnd, &cRC); + FillRect(dialogDC, &cRC, (HBRUSH)(COLOR_3DFACE + 1)); + + // if the selection index exceeded the display items, then + // do display item shifting + if (selectedWindow >= nItems) + nShift = selectedWindow - nItems + 1; + else + nShift = 0; + + for (i = 0; i < nItems; ++i) + { + // get the icon to display + hIcon = iconList[i + nShift]; + + // calculate the position where we start drawing + xPos = DIALOG_MARGIN + CX_ITEM_SPACE * (i % nCols) + ITEM_MARGIN; + yPos = DIALOG_MARGIN + CY_ITEM_SPACE * (i / nCols) + ITEM_MARGIN; + + // centering + if (nItems < CoolSwitchColumns) + { + xPos += (itemsW - nItems * CX_ITEM_SPACE) / 2; + } + + // if this position is selected, + if (selectedWindow == i + nShift) + { + // create a solid pen + Color = GetSysColor(COLOR_HIGHLIGHT); + hPen = CreatePen(PS_SOLID, 1, Color); + + // draw a rectangle with using the pen + SelectObject(dialogDC, hPen); + SelectObject(dialogDC, GetStockObject(NULL_BRUSH)); + Rectangle(dialogDC, xPos, yPos, xPos + CX_ITEM, yPos + CY_ITEM); + Rectangle(dialogDC, xPos + 1, yPos + 1, + xPos + CX_ITEM - 1, yPos + CY_ITEM - 1); + + // delete the pen + DeleteObject(hPen); + } + + // draw icon + DrawIconEx(dialogDC, xPos + ICON_MARGIN, yPos + ICON_MARGIN, + hIcon, CX_ICON, CY_ICON, 0, NULL, DI_NORMAL); + } + + // set the text rectangle + SetRect(&textRC, DIALOG_MARGIN, DIALOG_MARGIN + itemsH, + totalW - DIALOG_MARGIN, totalH - DIALOG_MARGIN); + + // draw the sunken button around text + DrawFrameControl(dialogDC, &textRC, DFC_BUTTON, + DFCS_BUTTONPUSH | DFCS_PUSHED); + + // get text + CharCount = GetWindowTextW(windowList[selectedWindow], windowText, + _countof(windowText)); + + // draw text + dcFont = SelectObject(dialogDC, dialogFont); + SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); + SetBkMode(dialogDC, TRANSPARENT); + DrawTextW(dialogDC, windowText, CharCount, &textRC, + DT_CENTER | DT_VCENTER | DT_END_ELLIPSIS | DT_SINGLELINE); + SelectObject(dialogDC, dcFont); + + // end painting + EndPaint(hWnd, &paint); } DWORD CreateSwitcherWindow(HINSTANCE hInstance) @@ -288,27 +387,23 @@ void PrepareWindow(VOID) { - cxBorder = GetSystemMetrics(SM_CXBORDER); - cyBorder = GetSystemMetrics(SM_CYBORDER); - nItems = windowCount; - nCols = min(max(nItems,8),12); - nRows = (nItems+nCols-1)/nCols; - - itemsW = nCols*32 + (nCols+1)*8; - itemsH = nRows*32 + (nRows+1)*8; - - totalW = itemsW + 2*cxBorder + 4; - totalH = itemsH + 2*cyBorder + fontHeight + 8; // give extra pixels for the window title - - xOffset = 8; - yOffset = 8; - - if (nItems < nCols) - { - int w2 = nItems*32 + (nItems-1)*8; - xOffset = (itemsW-w2)/2; - } + + nCols = CoolSwitchColumns; + nRows = (nItems + CoolSwitchColumns - 1) / CoolSwitchColumns; + if (nRows > CoolSwitchRows) + { + nRows = CoolSwitchRows; + nItems = nRows * nCols; + } + + itemsW = nCols * CX_ITEM_SPACE; + itemsH = nRows * CY_ITEM_SPACE; + + totalW = itemsW + 2 * DIALOG_MARGIN; + totalH = itemsH + 2 * DIALOG_MARGIN; + totalH += fontHeight + 2 * CY_TEXT_MARGIN; + ResizeAndCenter(switchdialog, totalW, totalH); } @@ -338,20 +433,95 @@ return TRUE; } +void RotateTasks(BOOL bShift) +{ + HWND hwndFirst, hwndLast; + DWORD Size; + + if (windowCount < 2 || !Esc) + return; + + hwndFirst = windowList[0]; + hwndLast = windowList[windowCount - 1]; + + if (bShift) + { + SetWindowPos(hwndLast, HWND_TOP, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOOWNERZORDER | SWP_NOREPOSITION); + + MakeWindowActive(hwndLast); + + Size = (windowCount - 1) * sizeof(HWND); + MoveMemory(&windowList[1], &windowList[0], Size); + windowList[0] = hwndLast; + } + else + { + SetWindowPos(hwndFirst, hwndLast, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOOWNERZORDER | SWP_NOREPOSITION); + + MakeWindowActive(windowList[1]); + + Size = (windowCount - 1) * sizeof(HWND); + MoveMemory(&windowList[0], &windowList[1], Size); + windowList[windowCount - 1] = hwndFirst; + } +} + +VOID +DestroyAppWindows(VOID) +{ + // for every item of the icon list: + INT i; + for (i = 0; i < windowCount; ++i) + { + // destroy the icon + DestroyIcon(iconList[i]); + iconList[i] = NULL; + } +} + LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) { - HWND hwnd, hwndActive; + HWND hwndActive; MSG msg; - BOOL Esc = FALSE; - INT Count = 0; - WCHAR Text[1024]; + + // FIXME: Is loading timing OK? + LoadCoolSwitchSettings(); + + if (!CoolSwitch) + return 0; // Already in the loop. - if (switchdialog) return 0; + if (switchdialog || Esc) return 0; hwndActive = GetActiveWindow(); // Nothing is active so exit. if (!hwndActive) return 0; + + if (lParam == VK_ESCAPE) + { + Esc = TRUE; + + windowCount = 0; + EnumWindowsZOrder(EnumerateCallback, 0); + + if (windowCount < 2) + return 0; + + RotateTasks(GetAsyncKeyState(VK_SHIFT) < 0); + + hwndActive = GetActiveWindow(); + + if (hwndActive == NULL) + { + Esc = FALSE; + return 0; + } + } + // Capture current active window. SetCapture( hwndActive ); @@ -364,25 +534,6 @@ break; case VK_ESCAPE: - windowCount = 0; - Count = 0; - EnumWindowsZOrder(EnumerateCallback, 0); - if (windowCount < 2) goto Exit; - if (wParam == SC_NEXTWINDOW) - Count = 1; - else - { - if (windowCount == 2) - Count = 0; - else - Count = windowCount - 1; - } - TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount); - hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, _countof(Text)); - TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text); - MakeWindowActive(hwnd); - Esc = TRUE; break; default: @@ -429,41 +580,25 @@ PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); if (HIWORD(msg.lParam) & KF_ALTDOWN) { - INT Shift; if ( msg.wParam == VK_TAB ) { if (Esc) break; - Shift = GetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; - if (Shift == SC_NEXTWINDOW) - { - selectedWindow = (selectedWindow + 1)%windowCount; - } - else + if (GetKeyState(VK_SHIFT) < 0) { selectedWindow = selectedWindow - 1; if (selectedWindow < 0) selectedWindow = windowCount - 1; + } + else + { + selectedWindow = (selectedWindow + 1)%windowCount; } InvalidateRect(switchdialog, NULL, TRUE); } else if ( msg.wParam == VK_ESCAPE ) { if (!Esc) break; - if (windowCount < 2) - goto Exit; - if (wParam == SC_NEXTWINDOW) - { - Count = (Count + 1)%windowCount; - } - else - { - Count--; - if (Count < 0) - Count = windowCount - 1; - } - hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, _countof(Text)); - MakeWindowActive(hwnd); + RotateTasks(GetKeyState(VK_SHIFT) < 0); } } break; @@ -486,21 +621,12 @@ Exit: ReleaseCapture(); if (switchdialog) DestroyWindow(switchdialog); + if (Esc) DestroyAppWindows(); switchdialog = NULL; selectedWindow = 0; windowCount = 0; + Esc = FALSE; return 0; -} - -VOID -DestroyAppWindows(VOID) -{ - INT i; - for (i=0; i< windowCount; i++) - { - HICON hIcon = iconList[i]; - DestroyIcon(hIcon); - } } // @@ -532,10 +658,23 @@ { PrepareWindow(); ati = (PALTTABINFO)GetWindowLongPtrW(hWnd, 0); + ati->cbSize = sizeof(ALTTABINFO); ati->cItems = nItems; - ati->cxItem = ati->cyItem = 43; + ati->cColumns = nCols; ati->cRows = nRows; - ati->cColumns = nCols; + if (nCols) + { + ati->iColFocus = (selectedWindow - nShift) % nCols; + ati->iRowFocus = (selectedWindow - nShift) / nCols; + } + else + { + ati->iColFocus = 0; + ati->iRowFocus = 0; + } + ati->cxItem = CX_ITEM_SPACE; + ati->cyItem = CY_ITEM_SPACE; + ati->ptStart = ptStart; } return 0;

1 0

[hbelusca] 73331: [LSASRV]: Use LsapAllocateHeapZero to initialize the AllocateLsaHeap member of the LSA auth DispatchTable. Should fix login (this means some of the code calling DispatchTable->All...
by hbelusca＠svn.reactos.org 21 Nov '16

21 Nov '16

Author: hbelusca Date: Mon Nov 21 14:42:14 2016 New Revision: 73331 URL: http://svn.reactos.org/svn/reactos?rev=73331&view=rev Log: [LSASRV]: Use LsapAllocateHeapZero to initialize the AllocateLsaHeap member of the LSA auth DispatchTable. Should fix login (this means some of the code calling DispatchTable->AllocateLsaHeap expect zero-initialized memory). Addendum to r73330. CORE-12432 Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Nov 21 14:42:14 2016 @@ -488,7 +488,7 @@ DispatchTable.AddCredential = &LsapAddCredential; DispatchTable.GetCredentials = &LsapGetCredentials; DispatchTable.DeleteCredential = &LsapDeleteCredential; - DispatchTable.AllocateLsaHeap = &LsapAllocateHeap; + DispatchTable.AllocateLsaHeap = &LsapAllocateHeapZero; DispatchTable.FreeLsaHeap = &LsapFreeHeap; DispatchTable.AllocateClientBuffer = &LsapAllocateClientBuffer; DispatchTable.FreeClientBuffer = &LsapFreeClientBuffer;

1 0

[hbelusca] 73330: [LSASRV]: Implement a simplified version of LsaIAllocateHeap / LsaIAllocateHeapZero / LsaIFreeHeap. CORE-12432
by hbelusca＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: hbelusca Date: Sun Nov 20 23:53:49 2016 New Revision: 73330 URL: http://svn.reactos.org/svn/reactos?rev=73330&view=rev Log: [LSASRV]: Implement a simplified version of LsaIAllocateHeap / LsaIAllocateHeapZero / LsaIFreeHeap. CORE-12432 Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Nov 20 23:53:49 2016 @@ -360,25 +360,27 @@ } -static PVOID NTAPI LsapAllocateHeap(IN ULONG Length) { - return RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - Length); -} - - -static + return RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); +} + + +PVOID +NTAPI +LsapAllocateHeapZero(IN ULONG Length) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); +} + + VOID NTAPI LsapFreeHeap(IN PVOID Base) { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Base); + RtlFreeHeap(RtlGetProcessHeap(), 0, Base); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Nov 20 23:53:49 2016 @@ -4,8 +4,8 @@ @ stub DsRolerGetDcOperationProgress @ stub DsRolerGetDcOperationResults @ stub LsaIAddNameToLogonSession -@ stub LsaIAllocateHeap -@ stub LsaIAllocateHeapZero +@ stdcall LsaIAllocateHeap(long) LsapAllocateHeap +@ stdcall LsaIAllocateHeapZero(long) LsapAllocateHeapZero @ stub LsaIAuditAccountLogon @ stub LsaIAuditAccountLogonEx @ stub LsaIAuditKdcEvent @@ -27,7 +27,7 @@ @ stub LsaIFilterSids @ stub LsaIForestTrustFindMatch @ stub LsaIFreeForestTrustInfo -@ stub LsaIFreeHeap +@ stdcall LsaIFreeHeap(ptr) LsapFreeHeap @ stub LsaIFreeReturnBuffer @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER

1 0

[hbelusca] 73329: [LSASRV]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: hbelusca Date: Sun Nov 20 23:53:10 2016 New Revision: 73329 URL: http://svn.reactos.org/svn/reactos?rev=73329&view=rev Log: [LSASRV]: Whitespace fixes only. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Nov 20 23:53:10 2016 @@ -1,147 +1,147 @@ - @ stub DsRolerDcAsDc - @ stub DsRolerDcAsReplica - @ stub DsRolerDemoteDc - @ stub DsRolerGetDcOperationProgress - @ stub DsRolerGetDcOperationResults - @ stub LsaIAddNameToLogonSession - @ stub LsaIAllocateHeap - @ stub LsaIAllocateHeapZero - @ stub LsaIAuditAccountLogon - @ stub LsaIAuditAccountLogonEx - @ stub LsaIAuditKdcEvent - @ stub LsaIAuditKerberosLogon - @ stub LsaIAuditLogonUsingExplicitCreds - @ stub LsaIAuditNotifyPackageLoad - @ stub LsaIAuditPasswordAccessEvent - @ stub LsaIAuditSamEvent - @ stub LsaICallPackage - @ stub LsaICallPackageEx - @ stub LsaICallPackagePassthrough - @ stub LsaICancelNotification - @ stub LsaIChangeSecretCipherKey - @ stub LsaICryptProtectData - @ stub LsaICryptUnprotectData - @ stub LsaIDsNotifiedObjectChange - @ stub LsaIEnumerateSecrets - @ stub LsaIEventNotify - @ stub LsaIFilterSids - @ stub LsaIForestTrustFindMatch - @ stub LsaIFreeForestTrustInfo - @ stub LsaIFreeHeap - @ stub LsaIFreeReturnBuffer - @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA - @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER - @ stdcall LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER(ptr) - @ stdcall LsaIFree_LSAPR_CR_CIPHER_VALUE(ptr) - @ stub LsaIFree_LSAPR_POLICY_DOMAIN_INFORMATION - @ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) - @ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) - @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) - @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) - @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) - @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) - @ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) - @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO - @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER - @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX - @ stub LsaIFree_LSAPR_TRUST_INFORMATION - @ stub LsaIFree_LSAPR_UNICODE_STRING - @ stub LsaIFree_LSAPR_UNICODE_STRING_BUFFER - @ stub LsaIFree_LSAP_SITENAME_INFO - @ stub LsaIFree_LSAP_SITE_INFO - @ stub LsaIFree_LSAP_SUBNET_INFO - @ stub LsaIFree_LSAP_UPN_SUFFIXES - @ stub LsaIFree_LSA_FOREST_TRUST_COLLISION_INFORMATION - @ stub LsaIFree_LSA_FOREST_TRUST_INFORMATION - @ stub LsaIGetBootOption - @ stub LsaIGetCallInfo - @ stub LsaIGetForestTrustInformation - @ stub LsaIGetLogonGuid - @ stub LsaIGetNbAndDnsDomainNames - @ stub LsaIGetPrivateData - @ stub LsaIGetSerialNumberPolicy - @ stub LsaIGetSerialNumberPolicy2 - @ stub LsaIGetSiteName - @ stub LsaIHealthCheck - @ stub LsaIImpersonateClient - @ stub LsaIInitializeWellKnownSids - @ stub LsaIIsClassIdLsaClass - @ stub LsaIIsDsPaused - @ stub LsaIKerberosRegisterTrustNotification - @ stub LsaILookupWellKnownName - @ stub LsaINotifyChangeNotification - @ stub LsaINotifyNetlogonParametersChangeW - @ stub LsaINotifyPasswordChanged - @ stdcall LsaIOpenPolicyTrusted(ptr) - @ stub LsaIQueryForestTrustInfo - @ stub LsaIQueryInformationPolicyTrusted - @ stub LsaIQuerySiteInfo - @ stub LsaIQuerySubnetInfo - @ stub LsaIQueryUpnSuffixes - @ stub LsaIRegisterNotification - @ stub LsaIRegisterPolicyChangeNotificationCallback - @ stub LsaISafeMode - @ stub LsaISamIndicatedDsStarted - @ stub LsaISetBootOption - @ stub LsaISetClientDnsHostName - @ stub LsaISetLogonGuidInLogonSession - @ stub LsaISetPrivateData - @ stub LsaISetSerialNumberPolicy - @ stub LsaISetTimesSecret - @ stub LsaISetupWasRun - @ stub LsaITestCall - @ stub LsaIUnregisterAllPolicyChangeNotificationCallback - @ stub LsaIUnregisterPolicyChangeNotificationCallback - @ stub LsaIUpdateForestTrustInformation - @ stub LsaIWriteAuditEvent - @ stub LsapAuOpenSam - @ stub LsapCheckBootMode - @ stub LsapDsDebugInitialize - @ stub LsapDsInitializeDsStateInfo - @ stub LsapDsInitializePromoteInterface - @ stdcall LsapInitLsa() - @ stdcall LsarAddPrivilegesToAccount(ptr ptr) - @ stdcall LsarClose(ptr) - @ stdcall LsarCreateAccount(ptr ptr long ptr) - @ stdcall LsarCreateSecret(ptr ptr long ptr) - @ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) - @ stdcall LsarCreateTrustedDomainEx(ptr ptr ptr long ptr) - @ stdcall LsarDelete(ptr) - @ stdcall LsarEnumerateAccounts(ptr ptr ptr long) - @ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) - @ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) - @ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) - @ stdcall LsarEnumerateTrustedDomainsEx(ptr long ptr long) - @ stdcall LsarGetQuotasForAccount(ptr ptr) - @ stdcall LsarGetSystemAccessAccount(ptr ptr) - @ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) - @ stdcall LsarLookupPrivilegeDisplayName(ptr ptr long long ptr ptr) - @ stdcall LsarLookupPrivilegeName(ptr ptr ptr) - @ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) - @ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) - @ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) - @ stdcall LsarOpenAccount(ptr ptr long ptr) - @ stdcall LsarOpenPolicy(ptr ptr long ptr) - @ stdcall LsarOpenPolicySce(ptr ptr long ptr) - @ stdcall LsarOpenSecret(ptr ptr long ptr) - @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) - @ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) - @ stdcall LsarQueryDomainInformationPolicy(ptr long ptr) - @ stdcall LsarQueryForestTrustInformation(ptr ptr long ptr) - @ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) - @ stdcall LsarQueryInformationPolicy(ptr long ptr) - @ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) - @ stdcall LsarQuerySecurityObject(ptr long ptr) - @ stdcall LsarQueryTrustedDomainInfo(ptr ptr long ptr) - @ stdcall LsarQueryTrustedDomainInfoByName(ptr ptr long ptr) - @ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) - @ stdcall LsarSetDomainInformationPolicy(ptr long long) - @ stdcall LsarSetForestTrustInformation(ptr ptr long ptr long ptr) - @ stdcall LsarSetInformationPolicy(ptr long ptr) - @ stdcall LsarSetInformationTrustedDomain(ptr long ptr) - @ stdcall LsarSetQuotasForAccount(ptr ptr) - @ stdcall LsarSetSecret(ptr ptr ptr) - @ stdcall LsarSetSecurityObject(ptr long ptr) - @ stdcall LsarSetSystemAccessAccount(ptr long) - @ stdcall LsarSetTrustedDomainInfoByName(ptr ptr long long) - @ stdcall ServiceInit() +@ stub DsRolerDcAsDc +@ stub DsRolerDcAsReplica +@ stub DsRolerDemoteDc +@ stub DsRolerGetDcOperationProgress +@ stub DsRolerGetDcOperationResults +@ stub LsaIAddNameToLogonSession +@ stub LsaIAllocateHeap +@ stub LsaIAllocateHeapZero +@ stub LsaIAuditAccountLogon +@ stub LsaIAuditAccountLogonEx +@ stub LsaIAuditKdcEvent +@ stub LsaIAuditKerberosLogon +@ stub LsaIAuditLogonUsingExplicitCreds +@ stub LsaIAuditNotifyPackageLoad +@ stub LsaIAuditPasswordAccessEvent +@ stub LsaIAuditSamEvent +@ stub LsaICallPackage +@ stub LsaICallPackageEx +@ stub LsaICallPackagePassthrough +@ stub LsaICancelNotification +@ stub LsaIChangeSecretCipherKey +@ stub LsaICryptProtectData +@ stub LsaICryptUnprotectData +@ stub LsaIDsNotifiedObjectChange +@ stub LsaIEnumerateSecrets +@ stub LsaIEventNotify +@ stub LsaIFilterSids +@ stub LsaIForestTrustFindMatch +@ stub LsaIFreeForestTrustInfo +@ stub LsaIFreeHeap +@ stub LsaIFreeReturnBuffer +@ stub LsaIFree_LSAI_PRIVATE_DATA #DATA +@ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER +@ stdcall LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER(ptr) +@ stdcall LsaIFree_LSAPR_CR_CIPHER_VALUE(ptr) +@ stub LsaIFree_LSAPR_POLICY_DOMAIN_INFORMATION +@ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) +@ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) +@ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) +@ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) +@ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) +@ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) +@ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) +@ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO +@ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER +@ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX +@ stub LsaIFree_LSAPR_TRUST_INFORMATION +@ stub LsaIFree_LSAPR_UNICODE_STRING +@ stub LsaIFree_LSAPR_UNICODE_STRING_BUFFER +@ stub LsaIFree_LSAP_SITENAME_INFO +@ stub LsaIFree_LSAP_SITE_INFO +@ stub LsaIFree_LSAP_SUBNET_INFO +@ stub LsaIFree_LSAP_UPN_SUFFIXES +@ stub LsaIFree_LSA_FOREST_TRUST_COLLISION_INFORMATION +@ stub LsaIFree_LSA_FOREST_TRUST_INFORMATION +@ stub LsaIGetBootOption +@ stub LsaIGetCallInfo +@ stub LsaIGetForestTrustInformation +@ stub LsaIGetLogonGuid +@ stub LsaIGetNbAndDnsDomainNames +@ stub LsaIGetPrivateData +@ stub LsaIGetSerialNumberPolicy +@ stub LsaIGetSerialNumberPolicy2 +@ stub LsaIGetSiteName +@ stub LsaIHealthCheck +@ stub LsaIImpersonateClient +@ stub LsaIInitializeWellKnownSids +@ stub LsaIIsClassIdLsaClass +@ stub LsaIIsDsPaused +@ stub LsaIKerberosRegisterTrustNotification +@ stub LsaILookupWellKnownName +@ stub LsaINotifyChangeNotification +@ stub LsaINotifyNetlogonParametersChangeW +@ stub LsaINotifyPasswordChanged +@ stdcall LsaIOpenPolicyTrusted(ptr) +@ stub LsaIQueryForestTrustInfo +@ stub LsaIQueryInformationPolicyTrusted +@ stub LsaIQuerySiteInfo +@ stub LsaIQuerySubnetInfo +@ stub LsaIQueryUpnSuffixes +@ stub LsaIRegisterNotification +@ stub LsaIRegisterPolicyChangeNotificationCallback +@ stub LsaISafeMode +@ stub LsaISamIndicatedDsStarted +@ stub LsaISetBootOption +@ stub LsaISetClientDnsHostName +@ stub LsaISetLogonGuidInLogonSession +@ stub LsaISetPrivateData +@ stub LsaISetSerialNumberPolicy +@ stub LsaISetTimesSecret +@ stub LsaISetupWasRun +@ stub LsaITestCall +@ stub LsaIUnregisterAllPolicyChangeNotificationCallback +@ stub LsaIUnregisterPolicyChangeNotificationCallback +@ stub LsaIUpdateForestTrustInformation +@ stub LsaIWriteAuditEvent +@ stub LsapAuOpenSam +@ stub LsapCheckBootMode +@ stub LsapDsDebugInitialize +@ stub LsapDsInitializeDsStateInfo +@ stub LsapDsInitializePromoteInterface +@ stdcall LsapInitLsa() +@ stdcall LsarAddPrivilegesToAccount(ptr ptr) +@ stdcall LsarClose(ptr) +@ stdcall LsarCreateAccount(ptr ptr long ptr) +@ stdcall LsarCreateSecret(ptr ptr long ptr) +@ stdcall LsarCreateTrustedDomain(ptr ptr long ptr) +@ stdcall LsarCreateTrustedDomainEx(ptr ptr ptr long ptr) +@ stdcall LsarDelete(ptr) +@ stdcall LsarEnumerateAccounts(ptr ptr ptr long) +@ stdcall LsarEnumeratePrivileges(ptr ptr ptr long) +@ stdcall LsarEnumeratePrivilegesAccount(ptr ptr) +@ stdcall LsarEnumerateTrustedDomains(ptr ptr ptr long) +@ stdcall LsarEnumerateTrustedDomainsEx(ptr long ptr long) +@ stdcall LsarGetQuotasForAccount(ptr ptr) +@ stdcall LsarGetSystemAccessAccount(ptr ptr) +@ stdcall LsarLookupNames(ptr long ptr ptr ptr long ptr) +@ stdcall LsarLookupPrivilegeDisplayName(ptr ptr long long ptr ptr) +@ stdcall LsarLookupPrivilegeName(ptr ptr ptr) +@ stdcall LsarLookupPrivilegeValue(ptr ptr ptr) +@ stdcall LsarLookupSids(ptr ptr ptr ptr long ptr) +@ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) +@ stdcall LsarOpenAccount(ptr ptr long ptr) +@ stdcall LsarOpenPolicy(ptr ptr long ptr) +@ stdcall LsarOpenPolicySce(ptr ptr long ptr) +@ stdcall LsarOpenSecret(ptr ptr long ptr) +@ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) +@ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) +@ stdcall LsarQueryDomainInformationPolicy(ptr long ptr) +@ stdcall LsarQueryForestTrustInformation(ptr ptr long ptr) +@ stdcall LsarQueryInfoTrustedDomain(ptr long ptr) +@ stdcall LsarQueryInformationPolicy(ptr long ptr) +@ stdcall LsarQuerySecret(ptr ptr ptr ptr ptr) +@ stdcall LsarQuerySecurityObject(ptr long ptr) +@ stdcall LsarQueryTrustedDomainInfo(ptr ptr long ptr) +@ stdcall LsarQueryTrustedDomainInfoByName(ptr ptr long ptr) +@ stdcall LsarRemovePrivilegesFromAccount(ptr long ptr) +@ stdcall LsarSetDomainInformationPolicy(ptr long long) +@ stdcall LsarSetForestTrustInformation(ptr ptr long ptr long ptr) +@ stdcall LsarSetInformationPolicy(ptr long ptr) +@ stdcall LsarSetInformationTrustedDomain(ptr long ptr) +@ stdcall LsarSetQuotasForAccount(ptr ptr) +@ stdcall LsarSetSecret(ptr ptr ptr) +@ stdcall LsarSetSecurityObject(ptr long ptr) +@ stdcall LsarSetSystemAccessAccount(ptr long) +@ stdcall LsarSetTrustedDomainInfoByName(ptr ptr long long) +@ stdcall ServiceInit()

1 0

[pschweitzer] 73328: [KMTESTS:MM] This tests doesn't fail anylonger on ReactOS (not sure which rev fixed it) ROSTESTS-108
by pschweitzer＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: pschweitzer Date: Sun Nov 20 20:58:22 2016 New Revision: 73328 URL: http://svn.reactos.org/svn/reactos?rev=73328&view=rev Log: [KMTESTS:MM] This tests doesn't fail anylonger on ReactOS (not sure which rev fixed it) ROSTESTS-108 Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] Sun Nov 20 20:58:22 2016 @@ -455,14 +455,10 @@ { NTSTATUS Status; HANDLE Section = NULL; -#ifdef ROSTESTS_108_FIXED PFILE_OBJECT FileObject; -#endif /* ROSTESTS_108_FIXED */ LARGE_INTEGER Length; Length.QuadPart = TestStringSize; -/* FIXME: Null pointer dereference. See ROSTESTS-108 */ -#ifdef ROSTESTS_108_FIXED //mimic lack of section support for a particular file as well. Status = ObReferenceObjectByHandle(FileHandle, STANDARD_RIGHTS_ALL, *IoFileObjectType, KernelMode, (PVOID *)&FileObject, NULL); if (!skip(NT_SUCCESS(Status), "Cannot reference object by handle\n")) @@ -474,7 +470,7 @@ FileObject->SectionObjectPointer = Pointers; ObDereferenceObject(FileObject); } -#endif /* ROSTESTS_108_FIXED */ + Length.QuadPart = TestStringSize; CREATE_SECTION(Section, (SECTION_ALL_ACCESS), NULL, Length, PAGE_READONLY, SEC_COMMIT, FileHandle, STATUS_SUCCESS, NO_HANDLE_CLOSE); CheckObject(Section, 2, 1);

1 0

[pschweitzer] 73327: [NTOSKRNL] When we're really not able to init cache for creating a file section, return the appropriate status code
by pschweitzer＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: pschweitzer Date: Sun Nov 20 20:55:17 2016 New Revision: 73327 URL: http://svn.reactos.org/svn/reactos?rev=73327&view=rev Log: [NTOSKRNL] When we're really not able to init cache for creating a file section, return the appropriate status code Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Nov 20 20:55:17 2016 @@ -3039,7 +3039,7 @@ /* FIXME: handle this situation */ ObDereferenceObject(Section); ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_FILE_FOR_SECTION; } }

1 0

[pschweitzer] 73326: [KMTESTS:MM] Thanks to r73325, these tests don't deadlock anymore on ReactOS. Enable them again (aka, revert r73227). ROSTESTS-248
by pschweitzer＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: pschweitzer Date: Sun Nov 20 18:42:15 2016 New Revision: 73326 URL: http://svn.reactos.org/svn/reactos?rev=73326&view=rev Log: [KMTESTS:MM] Thanks to r73325, these tests don't deadlock anymore on ReactOS. Enable them again (aka, revert r73227). ROSTESTS-248 Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Sun Nov 20 18:42:15 2016 @@ -19,12 +19,7 @@ UNICODE_STRING InitOnCreate = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnCreate"); UNICODE_STRING InitOnRW = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnRW"); UNICODE_STRING InvalidInit = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InvalidInit"); - - if (skip(0, "ROSTESTS-248: skipping kmtest:NtCreateSection because it hangs on testbot\n")) - { - return; - } - + KmtLoadDriver(L"NtCreateSection", FALSE); KmtOpenDriver();

1 0

[pschweitzer] 73325: [NTOSKRNL] When creating a new VACB, compare file offset to section size and not to file size. This fixes regression from r73199 where file size isn't changed anylonger, but se...
by pschweitzer＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: pschweitzer Date: Sun Nov 20 18:39:17 2016 New Revision: 73325 URL: http://svn.reactos.org/svn/reactos?rev=73325&view=rev Log: [NTOSKRNL] When creating a new VACB, compare file offset to section size and not to file size. This fixes regression from r73199 where file size isn't changed anylonger, but section size is. CORE-12430 ROSTESTS-248 Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=733… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sun Nov 20 18:39:17 2016 @@ -646,7 +646,7 @@ DPRINT("CcRosCreateVacb()\n"); - if (FileOffset >= SharedCacheMap->FileSize.QuadPart) + if (FileOffset >= SharedCacheMap->SectionSize.QuadPart) { *Vacb = NULL; return STATUS_INVALID_PARAMETER;

1 0

[akhaldi] 73324: [UNIATA] Update to v0.46e1. CORE-11451
by akhaldi＠svn.reactos.org 20 Nov '16

20 Nov '16

Author: akhaldi Date: Sun Nov 20 15:58:03 2016 New Revision: 73324 URL: http://svn.reactos.org/svn/reactos?rev=73324&view=rev Log: [UNIATA] Update to v0.46e1. CORE-11451 Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atacmd_map.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1,5 +1,5 @@ -// Build Version 0.46d7 +// Build Version 0.46d8 UCHAR const AtaCommands48[256] = { Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1302,8 +1302,20 @@ IN ULONG DeviceNumber ); -ULONG NTAPI +ULONG +NTAPI AtapiFindIsaController( + IN PVOID HwDeviceExtension, + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again + ); + +ULONG +NTAPI +AtapiReadArgumentString( IN PVOID HwDeviceExtension, IN PVOID Context, IN PVOID BusInformation, Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -553,4 +553,4 @@ PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; -const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); +/* static */ const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1881,6 +1881,7 @@ extern BOOLEAN hasPCI; extern BOOLEAN InDriverEntry; +extern BOOLEAN g_Dump; extern BOOLEAN g_opt_Verbose; extern ULONG g_opt_VirtualMachine; Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -105,6 +105,7 @@ ULONG g_opt_VirtualMachine = 0; // Auto BOOLEAN InDriverEntry = TRUE; +BOOLEAN g_Dump = FALSE; BOOLEAN g_opt_Verbose = 0; @@ -5036,7 +5037,7 @@ return TRUE; } - if(!DmaTransfer && !atapiDev) { + if((!DmaTransfer && !atapiDev) || deviceExtension->DriverMustPoll) { KdPrint2((PRINT_PREFIX " service PIO HDD\n")); UseDpc = FALSE; } @@ -6139,7 +6140,9 @@ } else { // srb->Cdb[0] == SCSIOP_REQUEST_SENSE) PSENSE_DATA senseData = (PSENSE_DATA) srb->DataBuffer; +#ifdef __REACTOS__ (void)senseData; +#endif KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI command status %#x\n", status)); if (status == SRB_STATUS_DATA_OVERRUN) { // Check to see if we at least get mininum number of bytes @@ -10516,16 +10519,56 @@ LARGE_INTEGER t0, t1; - Connect_DbgPrint(); KdPrint2((PRINT_PREFIX "%s", (PCCHAR)ver_string)); //a = (WCHAR)strlen(ver_string); - g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); - if(g_opt_Verbose) { - _PrintNtConsole("Universal ATA driver v 0." UNIATA_VER_STR "\n"); - } - IgnoreIsaCompatiblePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreIsaCompatiblePci", IgnoreIsaCompatiblePci) ? TRUE : FALSE; - IgnoreNativePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreNativePci", IgnoreNativePci) ? TRUE : FALSE; + statusToReturn = 0xffffffff; + + // Zero out structure. + RtlZeroMemory(((PCHAR)&hwInitializationData), sizeof(hwInitializationData)); + + // Set size of hwInitializationData. + hwInitializationData.comm.HwInitializationDataSize = + sizeof(hwInitializationData.comm) + +// sizeof(hwInitializationData.nt4) + + ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); + KdPrint(("HwInitializationDataSize = %x\n", hwInitializationData.comm.HwInitializationDataSize)); + + // Set entry points. + hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; + hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; + hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; + hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; + + // Specify size of extensions. + hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); + hwInitializationData.comm.SpecificLuExtensionSize = sizeof(HW_LU_EXTENSION); + hwInitializationData.comm.SrbExtensionSize = sizeof(ATA_REQ); + + // Indicate PIO device. + hwInitializationData.comm.MapBuffers = TRUE; + + // Request and parse arument string. + KdPrint2((PRINT_PREFIX "\n\nUniATA: parse ArgumentString\n")); + // Zero out structure. + hwInitializationData.comm.NumberOfAccessRanges = 2; + hwInitializationData.comm.HwFindAdapter = AtapiReadArgumentString; + ScsiPortInitialize(DriverObject, + Argument2, + &hwInitializationData.comm, + &adapterCount); + + if(!g_Dump) { + Connect_DbgPrint(); + g_opt_Verbose = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PrintLogo", 0); + if(g_opt_Verbose) { + _PrintNtConsole("Universal ATA driver v 0." UNIATA_VER_STR "\n"); + } + IgnoreIsaCompatiblePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreIsaCompatiblePci", IgnoreIsaCompatiblePci) ? TRUE : FALSE; + IgnoreNativePci = (BOOLEAN)AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreNativePci", IgnoreNativePci) ? TRUE : FALSE; + } else { + KdPrint(("crashdump mode\n")); + } if(!SavedDriverObject) { SavedDriverObject = (PDRIVER_OBJECT)DriverObject; @@ -10597,31 +10640,6 @@ g_LogToDisplay = AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"LogToDisplay", 0); #endif //_DEBUG - statusToReturn = 0xffffffff; - - // Zero out structure. - RtlZeroMemory(((PCHAR)&hwInitializationData), sizeof(hwInitializationData)); - - // Set size of hwInitializationData. - hwInitializationData.comm.HwInitializationDataSize = - sizeof(hwInitializationData.comm) + -// sizeof(hwInitializationData.nt4) + - ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); - KdPrint(("HwInitializationDataSize = %x\n", hwInitializationData.comm.HwInitializationDataSize)); - - // Set entry points. - hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; - hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; - hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; - hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; - - // Specify size of extensions. - hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); - hwInitializationData.comm.SpecificLuExtensionSize = sizeof(HW_LU_EXTENSION); - hwInitializationData.comm.SrbExtensionSize = sizeof(ATA_REQ); - - // Indicate PIO device. - hwInitializationData.comm.MapBuffers = TRUE; // Set PnP-specific API if(WinVer_Id() > WinVer_NT) { KdPrint(("set NeedPhysicalAddresses = TRUE\n")); @@ -10723,7 +10741,7 @@ SecondaryClaimed = TRUE; pref_alt = 0; - if(!WinVer_WDM_Model && !PrimaryClaimed && !SecondaryClaimed && + if(!WinVer_WDM_Model && !PrimaryClaimed && !SecondaryClaimed && !g_Dump && !(BMList[i].ChanInitOk & 0x80)) { // We just want to claim our PCI device in compatible mode, since we shall not @@ -11295,6 +11313,10 @@ UNICODE_STRING paramPath; + if(g_Dump) { + goto failed; + } + // <SavedRegPath>\<PathSuffix> -> <Name> // KdPrint(( "AtapiCheckRegValue: %ws -> %ws\n", PathSuffix, Name)); // KdPrint(( "AtapiCheckRegValue: RegistryPath %ws\n", RegistryPath->Buffer)); @@ -11332,6 +11354,7 @@ ExFreePool(paramPath.Buffer); if(!NT_SUCCESS(status)) { +failed: doRun = Default; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1148,14 +1148,14 @@ if(ChipType == ATPOLD) { /* Old Acard 850 */ - static const USHORT reg4x = 0x0301; + static const USHORT reg4x2 = 0x0301; for(i=udmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA + i)) { set_old_acard: ChangePciConfig1(0x54, a | (0x01 << dev) | ((i+1) << (dev*2))); SetPciConfig1(0x4a, reg4a); - SetPciConfig2(reg, reg4x); + SetPciConfig2(reg, reg4x2); return; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -623,6 +623,7 @@ } if(deviceExtension->MaxTransferMode >= ATA_SA150) { + KdPrint2((PRINT_PREFIX "setting UNIATA_SATA flag\n")); deviceExtension->HwFlags |= UNIATA_SATA; } @@ -977,13 +978,16 @@ i = AtapiFindListedDev((BUSMASTER_CONTROLLER_INFORMATION_BASE*)&SiSSouthAdapters[0], -1, HwDeviceExtension, SystemIoBusNumber, PCISLOTNUM_NOT_SPECIFIED, NULL); if(i != BMLIST_TERMINATOR) { + KdPrint2((PRINT_PREFIX "SIS South\n")); deviceExtension->HwFlags = (deviceExtension->HwFlags & ~CHIPTYPE_MASK) | SIS133OLD; deviceExtension->MaxTransferMode = ATA_UDMA6; //deviceExtension->MaxTransferMode = SiSSouthAdapters[i].MaxTransferMode; if(SiSSouthAdapters[i].RaidFlags & UNIATA_SATA) { + KdPrint2((PRINT_PREFIX "SIS South SATA\n")); deviceExtension->HwFlags |= UNIATA_SATA; if(SiSSouthAdapters[i].nDeviceId == 0x1182 || SiSSouthAdapters[i].nDeviceId == 0x1183) { + KdPrint2((PRINT_PREFIX "SIS_182\n")); SIS_182 = TRUE; } } Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1256,6 +1256,14 @@ /***********************************************************/ deviceExtension->UseDpc = TRUE; +#ifndef UNIATA_CORE + if (g_Dump) { + deviceExtension->DriverMustPoll = TRUE; + deviceExtension->UseDpc = FALSE; + deviceExtension->simplexOnly = TRUE; + deviceExtension->HwFlags |= UNIATA_NO_DPC; + } +#endif //UNIATA_CORE KdPrint2((PRINT_PREFIX "HwFlags = %x\n (3)", deviceExtension->HwFlags)); if(deviceExtension->HwFlags & UNIATA_NO_DPC) { /* CMD 649, ROSB SWK33, ICH4 */ @@ -2036,10 +2044,21 @@ KdPrint2((PRINT_PREFIX "Init ISR:\n")); + /* + We MUST register 2nd ISR for multichannel controllers even for UP systems. + This is needed for cases when + multichannel controller generate interrupt while we are still in its ISR for + other channle's interrupt. New interrupt must be detected and queued for + further processing. If we do not do this, system will not route this + interrupt to main ISR (since it is busy) and we shall get to infinite loop + looking for interrupt handler. + */ + if(!deviceExtension->MasterDev && (deviceExtension->NumberChannels > 1) && // do not touch MasterDev !deviceExtension->simplexOnly && /* // this is unnecessary on simplex controllers !BMList[i].Isr2DevObj*/ // handle re-init under w2k+ /*!ForceSimplex*/ + /*(CPU_num > 1) && // unnecessary for UP systems*/ TRUE) { // Ok, continue... KdPrint2((PRINT_PREFIX "Multichannel native mode, go...\n")); @@ -2340,14 +2359,23 @@ // if not, we go and find ourselves if (preConfig == FALSE) { + ULONG portBase_reg = 0; + ULONG irq_reg = 0; + if (!portBase) { portBase = AdapterAddresses[*adapterCount]; KdPrint2((PRINT_PREFIX "portBase[%d]=%x\n", *adapterCount, portBase)); } else { KdPrint2((PRINT_PREFIX "portBase=%x\n", portBase)); } - portBase = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortBase", portBase); - irq = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"Irq", irq); + + portBase_reg = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortBase", 0); + irq_reg = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"Irq", 0); + if(portBase_reg && irq_reg) { + KdPrint2((PRINT_PREFIX "use registry settings portBase=%x, irq=%d\n", portBase_reg, irq_reg)); + portBase = portBase_reg; + irq = irq_reg; + } // check if Primary/Secondary Master IDE claimed if(AtapiCheckIOInterference(ConfigInfo, portBase)) { goto next_adapter; @@ -2587,26 +2615,11 @@ // Determine whether this driver is being initialized by the // system or as a crash dump driver. - if (ArgumentString) { - + if (g_Dump) { #ifndef UNIATA_CORE - if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Crash dump\n")); - //atapiOnly = FALSE; - deviceExtension->DriverMustPoll = TRUE; - } else { - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Atapi Only\n")); - //atapiOnly = TRUE; - deviceExtension->DriverMustPoll = FALSE; - } + deviceExtension->DriverMustPoll = TRUE; #endif //UNIATA_CORE } else { - - KdPrint2((PRINT_PREFIX - "AtapiFindIsaController: Atapi Only (2)\n")); - //atapiOnly = TRUE; deviceExtension->DriverMustPoll = FALSE; } @@ -2690,6 +2703,8 @@ (*ConfigInfo->AccessRanges)[i].RangeLength = 0; (*ConfigInfo->AccessRanges)[i].RangeInMemory = FALSE; } + irq = 0; + portBase = 0; } #ifndef UNIATA_CORE } @@ -2713,6 +2728,34 @@ return SP_RETURN_ERROR; } // end AtapiFindIsaController() + +/* + Do nothing, but parse ScsiPort ArgumentString and setup global variables. +*/ + +ULONG +NTAPI +AtapiReadArgumentString( + IN PVOID HwDeviceExtension, + IN PVOID Context, + IN PVOID BusInformation, + IN PCHAR ArgumentString, + IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, + OUT PBOOLEAN Again + ) +{ +#ifndef __REACTOS__ + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +#endif + + if (AtapiParseArgumentString(ArgumentString, "dump") == 1) { + KdPrint2((PRINT_PREFIX + "AtapiReadArgumentString: Crash dump\n")); + //atapiOnly = FALSE; + g_Dump = TRUE; + } + return(SP_RETURN_NOT_FOUND); +} // end AtapiReadArgumentString() ULONG NTAPI @@ -3017,7 +3060,7 @@ // Issue the ATAPI identify command if this // is not for the crash dump utility. try_atapi: - if (!deviceExtension->DriverMustPoll) { + if (!g_Dump) { // Issue ATAPI packet identify command. if (IssueIdentify(HwDeviceExtension, Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sun Nov 20 15:58:03 2016 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "46d7" -#define UNIATA_VER_DOT 0.46.4.7 +#define UNIATA_VER_STR "46d8" +#define UNIATA_VER_DOT 0.46.4.8 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 46 #define UNIATA_VER_SUB_MJ 4 -#define UNIATA_VER_SUB_MN 7 -#define UNIATA_VER_DOT_COMMA 0,46,4,7 -#define UNIATA_VER_DOT_STR "0.46.4.7" +#define UNIATA_VER_SUB_MN 8 +#define UNIATA_VER_DOT_COMMA 0,46,4,8 +#define UNIATA_VER_DOT_STR "0.46.4.8" #define UNIATA_VER_YEAR 2016 #define UNIATA_VER_YEAR_STR "2016"

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