Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70332: [CLIPBRD]: SVN failure again: for some reason this file was not added to the code when applying the patch. See r70331. CORE-10679
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 21:21:28 2015 New Revision: 70332 URL: http://svn.reactos.org/svn/reactos?rev=70332&view=rev Log: [CLIPBRD]: SVN failure again: for some reason this file was not added to the code when applying the patch. See r70331. CORE-10679 Added: trunk/reactos/base/applications/clipbrd/scrollutils.h (with props) Added: trunk/reactos/base/applications/clipbrd/scrollutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/scrollutils.h (added) +++ trunk/reactos/base/applications/clipbrd/scrollutils.h [iso-8859-1] Sat Dec 12 21:21:28 2015 @@ -0,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/scrollutils.h + * PURPOSE: Scrolling releated helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +typedef struct _SCROLLSTATE +{ + int CurrentX; + int CurrentY; + int MaxX; + int MaxY; +} SCROLLSTATE, *LPSCROLLSTATE; + +void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void UpdateWindowScrollState(HWND hWnd, HBITMAP hBmp, LPSCROLLSTATE lpState); +BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state); Propchange: trunk/reactos/base/applications/clipbrd/scrollutils.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 70331: [CLIPBRD] Start scrolling support, work in progress. By Ricardo Hanke CORE-10679
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 21:15:53 2015 New Revision: 70331 URL: http://svn.reactos.org/svn/reactos?rev=70331&view=rev Log: [CLIPBRD] Start scrolling support, work in progress. By Ricardo Hanke CORE-10679 Added: trunk/reactos/base/applications/clipbrd/scrollutils.c (with props) Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/fileutils.h trunk/reactos/base/applications/clipbrd/precomp.h trunk/reactos/base/applications/clipbrd/winutils.h Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -4,6 +4,7 @@ cliputils.c winutils.c fileutils.c + scrollutils.c precomp.h) add_executable(clipbrd ${SOURCE} clipbrd.rc) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -11,6 +11,7 @@ static const WCHAR szClassName[] = L"ClipBookWClass"; CLIPBOARD_GLOBALS Globals; +SCROLLSTATE Scrollstate; static void SaveClipboardToFile(void) { @@ -124,8 +125,15 @@ Globals.uDisplayFormat = uFormat; } + if (Globals.hDspBmp) + { + DeleteObject(Globals.hDspBmp); + } + + ZeroMemory(&Scrollstate, sizeof(Scrollstate)); + UpdateWindowScrollState(Globals.hMainWnd, Globals.hDspBmp, &Scrollstate); + InvalidateRect(Globals.hMainWnd, NULL, TRUE); - UpdateWindow(Globals.hMainWnd); } static void InitMenuPopup(HMENU hMenu, LPARAM index) @@ -330,10 +338,40 @@ break; } + case WM_KEYDOWN: + { + HandleKeyboardScrollEvents(hWnd, uMsg, wParam, lParam); + break; + } + + case WM_HSCROLL: + { + HandleHorizontalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + break; + } + + case WM_VSCROLL: + { + HandleVerticalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + break; + } + case WM_SIZE: { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); + UpdateWindowScrollState(hWnd, Globals.hDspBmp, &Scrollstate); + + if ((Globals.uDisplayFormat == CF_METAFILEPICT) || + (Globals.uDisplayFormat == CF_ENHMETAFILE) || + (Globals.uDisplayFormat == CF_DSPENHMETAFILE) || + (Globals.uDisplayFormat == CF_DSPMETAFILEPICT)) + { + InvalidateRect(Globals.hMainWnd, NULL, FALSE); + } + else if (!IsClipboardFormatSupported(Globals.uDisplayFormat)) + { + InvalidateRect(Globals.hMainWnd, NULL, TRUE); + } + break; } @@ -428,6 +466,12 @@ UpdateWindow(hWnd); } } + break; + } + + case WM_SYSCOLORCHANGE: + { + SetDisplayFormat(Globals.uDisplayFormat); break; } @@ -510,5 +554,10 @@ } } + if (Globals.hDspBmp) + { + DeleteObject(Globals.hDspBmp); + } + return (int)msg.wParam; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.c + * FILE: base/applications/clipbrd/fileutils.h * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke */ Modified: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -15,6 +15,7 @@ #include "cliputils.h" #include "fileutils.h" #include "winutils.h" +#include "scrollutils.h" #define MAX_STRING_LEN 255 #define DISPLAY_MENU_POS 2 @@ -28,6 +29,7 @@ HMENU hMenu; UINT uDisplayFormat; UINT uCheckedItem; + HBITMAP hDspBmp; } CLIPBOARD_GLOBALS; extern CLIPBOARD_GLOBALS Globals; Added: trunk/reactos/base/applications/clipbrd/scrollutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/scrollutils.c (added) +++ trunk/reactos/base/applications/clipbrd/scrollutils.c [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -0,0 +1,267 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/scrollutils.c + * PURPOSE: Scrolling releated helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +#include "precomp.h" + +static int InternalSetScrollInfo(HWND hWnd, int nMin, int nMax, UINT nPage, int nPos, int fnBar) +{ + SCROLLINFO si; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; + si.nMin = nMin; + si.nMax = nMax; + si.nPage = nPage; + si.nPos = nPos; + + return SetScrollInfo(hWnd, fnBar, &si, TRUE); +} + +void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (wParam) + { + case VK_UP: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEUP, 0), 0); + break; + } + + case VK_DOWN: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + break; + } + + case VK_LEFT: + { + SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEUP, 0), 0); + break; + } + + case VK_RIGHT: + { + SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + break; + } + + case VK_PRIOR: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEUP, 0), 0); + break; + } + + case VK_NEXT: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEDOWN, 0), 0); + break; + } + + default: + { + break; + } + } +} + +void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +{ + SCROLLINFO si; + int Delta; + int NewPos; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_TRACKPOS; + GetScrollInfo(hWnd, SB_HORZ, &si); + + switch (LOWORD(wParam)) + { + case SB_THUMBPOSITION: + case SB_THUMBTRACK: + { + NewPos = si.nTrackPos; + break; + } + + case SB_LINELEFT: + { + NewPos = state->CurrentX - 5; + break; + } + + case SB_LINERIGHT: + { + NewPos = state->CurrentX + 5; + break; + } + + case SB_PAGELEFT: + { + NewPos = state->CurrentX - si.nPage; + break; + } + + case SB_PAGERIGHT: + { + NewPos = state->CurrentX + si.nPage; + break; + } + + default: + { + NewPos = state->CurrentX; + break; + } + } + + NewPos = min(state->MaxX, max(0, NewPos)); + + if (NewPos == state->CurrentX) + { + return; + } + + Delta = NewPos - state->CurrentX; + + state->CurrentX = NewPos; + + ScrollWindowEx(hWnd, -Delta, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); + + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + si.nPos = state->CurrentX; + SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); +} + +void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +{ + SCROLLINFO si; + int Delta; + int NewPos; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_TRACKPOS; + GetScrollInfo(hWnd, SB_VERT, &si); + + switch (LOWORD(wParam)) + { + case SB_THUMBPOSITION: + case SB_THUMBTRACK: + { + NewPos = si.nTrackPos; + break; + } + + case SB_LINEUP: + { + NewPos = state->CurrentY - 5; + break; + } + + case SB_LINEDOWN: + { + NewPos = state->CurrentY + 5; + break; + } + + case SB_PAGEUP: + { + NewPos = state->CurrentY - si.nPage; + break; + } + + case SB_PAGEDOWN: + { + NewPos = state->CurrentY + si.nPage; + break; + } + + default: + { + NewPos = state->CurrentY; + break; + } + } + + NewPos = min(state->MaxY, max(0, NewPos)); + + if (NewPos == state->CurrentY) + { + return; + } + + Delta = NewPos - state->CurrentY; + + state->CurrentY = NewPos; + + ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); + + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + si.nPos = state->CurrentY; + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); +} + +void UpdateWindowScrollState(HWND hWnd, HBITMAP hBitmap, LPSCROLLSTATE lpState) +{ + BITMAP bmp; + RECT rc; + + if (!GetObject(hBitmap, sizeof(BITMAP), &bmp)) + { + bmp.bmWidth = 0; + bmp.bmHeight = 0; + } + + if (!GetClientRect(hWnd, &rc)) + { + SetRectEmpty(&rc); + } + + lpState->MaxX = max(bmp.bmWidth - rc.right, 0); + lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); + InternalSetScrollInfo(hWnd, 0, bmp.bmWidth, rc.right, lpState->CurrentX, SB_HORZ); + + lpState->MaxY = max(bmp.bmHeight - rc.bottom, 0); + lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); + InternalSetScrollInfo(hWnd, 0, bmp.bmHeight, rc.bottom, lpState->CurrentY, SB_VERT); +} + +BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state) +{ + RECT rect; + BOOL ret; + HDC hdc; + int xpos; + int ypos; + + rect.left = ps.rcPaint.left; + rect.top = ps.rcPaint.top; + rect.right = (ps.rcPaint.right - ps.rcPaint.left); + rect.bottom = (ps.rcPaint.bottom - ps.rcPaint.top); + + xpos = ps.rcPaint.left + state.CurrentX; + ypos = ps.rcPaint.top + state.CurrentY; + + ret = FALSE; + + hdc = CreateCompatibleDC(ps.hdc); + if (hdc) + { + if (SelectObject(hdc, hBmp)) + { + ret = BitBlt(ps.hdc, rect.left, rect.top, rect.right, rect.bottom, hdc, xpos, ypos, SRCCOPY); + } + DeleteDC(hdc); + } + + return ret; +} Propchange: trunk/reactos/base/applications/clipbrd/scrollutils.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/clipbrd/winutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.c + * FILE: base/applications/clipbrd/winutils.h * PURPOSE: Miscellaneous helper functions. * PROGRAMMERS: Ricardo Hanke */

1 0

[hbelusca] 70330: [CLIPBRD]: Fix SVN patching failure & build; see r70329 and CORE-10662. Patch of r70329 was by Ricardo Hanke :)
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 20:47:36 2015 New Revision: 70330 URL: http://svn.reactos.org/svn/reactos?rev=70330&view=rev Log: [CLIPBRD]: Fix SVN patching failure & build; see r70329 and CORE-10662. Patch of r70329 was by Ricardo Hanke :) Modified: trunk/reactos/base/applications/clipbrd/winutils.c Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:47:36 2015 @@ -204,5 +204,5 @@ CloseClipboard(); - PlayEnhMetaFile(hdc, hEmf, lpRect); -} + return uResult; +}

1 0

[hbelusca] 70329: [CLIPBRD] Handle WM_PALETTECHANGED and WM_QUERYNEWPALETTE: realizes any palette found on the clipboard, if there is any, if it receives one of those messages.
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 20:40:19 2015 New Revision: 70329 URL: http://svn.reactos.org/svn/reactos?rev=70329&view=rev Log: [CLIPBRD] Handle WM_PALETTECHANGED and WM_QUERYNEWPALETTE: realizes any palette found on the clipboard, if there is any, if it receives one of those messages. Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/winutils.c trunk/reactos/base/applications/clipbrd/winutils.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -404,6 +404,30 @@ case WM_DROPFILES: { LoadClipboardFromDrop((HDROP)wParam); + break; + } + + case WM_QUERYNEWPALETTE: + { + if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + { + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + return TRUE; + } + return FALSE; + } + + case WM_PALETTECHANGED: + { + if ((HWND)wParam != hWnd) + { + if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + { + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + } + } break; } Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -156,3 +156,53 @@ hEmf = GetClipboardData(CF_ENHMETAFILE); PlayEnhMetaFile(hdc, hEmf, lpRect); } + +UINT RealizeClipboardPalette(HWND hWnd) +{ + HPALETTE hPalette; + HPALETTE hOldPalette; + UINT uResult; + HDC hDevContext; + + if (!OpenClipboard(NULL)) + { + return GDI_ERROR; + } + + if (!IsClipboardFormatAvailable(CF_PALETTE)) + { + CloseClipboard(); + return GDI_ERROR; + } + + hPalette = GetClipboardData(CF_PALETTE); + if (!hPalette) + { + CloseClipboard(); + return GDI_ERROR; + } + + hDevContext = GetDC(hWnd); + if (!hDevContext) + { + CloseClipboard(); + return GDI_ERROR; + } + + hOldPalette = SelectPalette(hDevContext, hPalette, FALSE); + if (!hOldPalette) + { + ReleaseDC(hWnd, hDevContext); + CloseClipboard(); + return GDI_ERROR; + } + + uResult = RealizePalette(hDevContext); + + SelectPalette(hDevContext, hOldPalette, FALSE); + ReleaseDC(hWnd, hDevContext); + + CloseClipboard(); + + PlayEnhMetaFile(hdc, hEmf, lpRect); +} Modified: trunk/reactos/base/applications/clipbrd/winutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -15,3 +15,4 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse); void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); +UINT RealizeClipboardPalette(HWND hWnd);

1 0

[hbelusca] 70328: [CLIPBRD] - Display the application icon in program's about dialog. - Add missing DT_NOPREFIX flag to DrawText() calls. - Let ShowLastWin32Error() show an error message even if th...
by hbelusca＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: hbelusca Date: Sat Dec 12 20:34:21 2015 New Revision: 70328 URL: http://svn.reactos.org/svn/reactos?rev=70328&view=rev Log: [CLIPBRD] - Display the application icon in program's about dialog. - Add missing DT_NOPREFIX flag to DrawText() calls. - Let ShowLastWin32Error() show an error message even if the last error code is zero. - Remove the calls to OpenClipboard() and CloseClipboard() from the functions in winutils.c and let the caller open and close the clipboard instead. Patch by Ricardo Hanke CORE-10657 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/winutils.c Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 20:34:21 2015 @@ -234,8 +234,12 @@ case CMD_ABOUT: { WCHAR szTitle[MAX_STRING_LEN]; + HICON hIcon; + + hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIP_ICON)); LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); - ShellAboutW(Globals.hMainWnd, szTitle, 0, NULL); + ShellAboutW(Globals.hMainWnd, szTitle, 0, hIcon); + DeleteObject(hIcon); break; } @@ -253,6 +257,11 @@ PAINTSTRUCT ps; RECT rc; + if (!OpenClipboard(NULL)) + { + return; + } + hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rc); @@ -265,7 +274,7 @@ case CF_UNICODETEXT: { - DrawTextFromClipboard(hdc, &rc, DT_LEFT); + DrawTextFromClipboard(hdc, &rc, DT_LEFT | DT_NOPREFIX); break; } @@ -301,13 +310,14 @@ default: { - - DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK); + DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); break; } } EndPaint(hWnd, &ps); + + CloseClipboard(); } static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:34:21 2015 @@ -14,8 +14,6 @@ LPWSTR lpMsgBuf = NULL; dwError = GetLastError(); - if (dwError == NO_ERROR) - return; FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); @@ -73,9 +71,6 @@ HGLOBAL hGlobal; LPWSTR lpchText; - if (!OpenClipboard(NULL)) - return; - hGlobal = GetClipboardData(CF_UNICODETEXT); if (!hGlobal) return; @@ -86,16 +81,12 @@ DrawTextW(hDC, lpchText, -1, lpRect, uFormat); GlobalUnlock(hGlobal); - CloseClipboard(); } void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop) { HDC hdcMem; HBITMAP hbm; - - if (!OpenClipboard(NULL)) - return; hdcMem = CreateCompatibleDC(hdcDest); if (hdcMem) @@ -105,7 +96,6 @@ BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcMem, nXSrc, nYSrc, dwRop); DeleteDC(hdcMem); } - CloseClipboard(); } void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse) @@ -114,9 +104,6 @@ LPBYTE lpBits; HGLOBAL hGlobal; INT iPalSize; - - if (!OpenClipboard(NULL)) - return; hGlobal = GetClipboardData(uFormat); if (!hGlobal) @@ -140,16 +127,12 @@ SetDIBitsToDevice(hdc, XDest, YDest, lpInfoHeader->biWidth, lpInfoHeader->biHeight, XSrc, YSrc, uStartScan, lpInfoHeader->biHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, fuColorUse); GlobalUnlock(hGlobal); - CloseClipboard(); } void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect) { LPMETAFILEPICT mp; HGLOBAL hGlobal; - - if (!OpenClipboard(NULL)) - return; hGlobal = GetClipboardData(CF_METAFILEPICT); if (!hGlobal) @@ -164,17 +147,12 @@ SetViewportOrgEx(hdc, lpRect->left, lpRect->top, NULL); PlayMetaFile(hdc, mp->hMF); GlobalUnlock(hGlobal); - CloseClipboard(); } void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) { HENHMETAFILE hEmf; - if (!OpenClipboard(NULL)) - return; - hEmf = GetClipboardData(CF_ENHMETAFILE); PlayEnhMetaFile(hdc, hEmf, lpRect); - CloseClipboard(); }

1 0

[spetreolle] 70327: Fixing several missing va_end issues in DHCP. Patch by Victor Martinez. CORE-10631
by spetreolle＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: spetreolle Date: Sat Dec 12 12:02:37 2015 New Revision: 70327 URL: http://svn.reactos.org/svn/reactos?rev=70327&view=rev Log: Fixing several missing va_end issues in DHCP. Patch by Victor Martinez. CORE-10631 Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ut… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] Sat Dec 12 12:02:37 2015 @@ -17,6 +17,8 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); + va_end( format ); + DPRINT("NOTE: %s\n", buf); return ret; @@ -29,6 +31,8 @@ va_start( arg_begin, format ); ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); + + va_end( format ); DPRINT("DEBUG: %s\n", buf); @@ -43,6 +47,8 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); + va_end( format ); + DPRINT("WARN: %s\n", buf); return ret; @@ -56,6 +62,8 @@ ret = _vsnprintf( buf, sizeof(buf), format, arg_begin ); + va_end( format ); + DPRINT("WARNING: %s\n", buf); return ret; @@ -67,6 +75,8 @@ va_start( arg_begin, format ); _vsnprintf( buf, sizeof(buf), format, arg_begin ); + + va_end( format ); DPRINT1("ERROR: %s\n", buf); }

1 0

[pschweitzer] 70326: [IPHLPAPI_APITEST] Add more tests
by pschweitzer＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: pschweitzer Date: Sat Dec 12 09:45:23 2015 New Revision: 70326 URL: http://svn.reactos.org/svn/reactos?rev=70326&view=rev Log: [IPHLPAPI_APITEST] Add more tests Modified: trunk/rostests/apitests/iphlpapi/SendARP.c Modified: trunk/rostests/apitests/iphlpapi/SendARP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/SendARP… ============================================================================== --- trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] Sat Dec 12 09:45:23 2015 @@ -14,13 +14,14 @@ #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> -static VOID TestUM(IPAddr * Source) +static VOID TestUM(IPAddr * Source, IPAddr * Gateway) { DWORD Err; ULONG Hw[2]; DWORD Size; BOOL Tested = FALSE; PIP_ADAPTER_ADDRESSES Addresses, Current; + PIP_ADAPTER_INFO Adapters, CurrentA; Err = SendARP(0, 0, NULL, NULL); ok(Err == ERROR_INVALID_PARAMETER, "Expected error: ERROR_INVALID_PARAMETER. Got: %lx\n", Err); @@ -117,15 +118,126 @@ break; } + free(Addresses); + if (!Tested) { skip("No suitable interface found\n"); - } - - free(Addresses); + return; + } + + Size = sizeof(IP_ADAPTER_INFO); + Adapters = (PIP_ADAPTER_INFO)malloc(Size); + if (!Adapters) + { + skip("Memory failure\n"); + return; + } + + Err = GetAdaptersInfo(Adapters, &Size); + if (Err == ERROR_BUFFER_OVERFLOW) + { + free(Adapters); + Adapters = (PIP_ADAPTER_INFO)malloc(Size); + if (!Adapters) + { + skip("Memory failure\n"); + return; + } + + Err = GetAdaptersInfo(Adapters, &Size); + } + + if (Err != ERROR_SUCCESS) + { + skip("GetAdaptersInfo() failure\n"); + free(Adapters); + return; + } + + Tested = FALSE; + for (CurrentA = Adapters; CurrentA; CurrentA = CurrentA->Next) + { + IPAddr IpAddr; + NTSTATUS Status; + const CHAR * Terminator; + + Status = RtlIpv4StringToAddressA(CurrentA->IpAddressList.IpAddress.String, TRUE, &Terminator, (struct in_addr *)&IpAddr); + if (!NT_SUCCESS(Status)) + continue; + + if (IpAddr != *Source) + continue; + + Status = RtlIpv4StringToAddressA(CurrentA->GatewayList.IpAddress.String, TRUE, &Terminator, (struct in_addr *)&IpAddr); + if (NT_SUCCESS(Status)) + { + trace("Gateway found: %lu.%lu.%lu.%lu\n", IpAddr & 0xFF, (IpAddr >> 8) & 0xFF, (IpAddr >> 16) & 0xFF, (IpAddr >> 24) & 0xFF); + Tested = TRUE; + *Gateway = IpAddr; + } + + break; + } + + free(Adapters); + + if (!Tested) + { + skip("No suitable gateway found\n"); + return; + } + + Size = 4; + Err = SendARP(*Gateway, *Source, Hw, &Size); + ok(Err == ERROR_GEN_FAILURE, "Expected error: ERROR_GEN_FAILURE. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(*Gateway, *Source, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(*Gateway, *Source, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 4; + Err = SendARP(*Source, *Gateway, Hw, &Size); + ok(Err == ERROR_NO_SYSTEM_RESOURCES, "Expected error: ERROR_NO_SYSTEM_RESOURCES. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(*Source, *Gateway, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(*Source, *Gateway, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 4; + Err = SendARP(*Gateway, 0x08080808, Hw, &Size); + ok(Err == ERROR_GEN_FAILURE, "Expected error: ERROR_GEN_FAILURE. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(*Gateway, 0x08080808, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(*Gateway, 0x08080808, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 4; + Err = SendARP(*Source, 0x08080808, Hw, &Size); + ok(Err == ERROR_NO_SYSTEM_RESOURCES, "Expected error: ERROR_NO_SYSTEM_RESOURCES. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(*Source, 0x08080808, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(*Source, 0x08080808, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); } -static VOID TestKM(IPAddr Source) +static VOID TestKM(IPAddr Source, IPAddr Gateway) { HANDLE hDevice; NTSTATUS Status; @@ -378,6 +490,213 @@ ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + if (!Gateway) + { + skip("No suitable gateway found\n"); + CloseHandle(hEvent); + CloseHandle(hDevice); + return; + } + + Ip[0] = Gateway; + Ip[1] = Source; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_UNSUCCESSFUL, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + Ip[0] = Source; + Ip[1] = Gateway; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INSUFFICIENT_RESOURCES, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + Ip[0] = Gateway; + Ip[1] = 0x08080808; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_UNSUCCESSFUL, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + Ip[0] = Source; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INSUFFICIENT_RESOURCES, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + CloseHandle(hEvent); CloseHandle(hDevice); } @@ -385,13 +704,14 @@ START_TEST(SendARP) { IPAddr Source = 0; - - TestUM(&Source); + IPAddr Gateway = 0; + + TestUM(&Source, &Gateway); if (!Source) { skip("No suitable interface found\n"); return; } - TestKM(Source); + TestKM(Source, Gateway); }

1 0

[tfaber] 70325: [0.4.0] - Update version to 0.4.0 - Properly determine SVN revision - Update CD root readme
by tfaber＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: tfaber Date: Sat Dec 12 08:32:56 2015 New Revision: 70325 URL: http://svn.reactos.org/svn/reactos?rev=70325&view=rev Log: [0.4.0] - Update version to 0.4.0 - Properly determine SVN revision - Update CD root readme Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/shell/explorer/res/bmp/158.bmp branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 12 08:32:56 2015 @@ -1 +1 @@ -/trunk:70000-70321 +/trunk:70000-70321,70324 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Dec 12 08:32:56 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321 +/trunk/reactos:70000-70321,70324 Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt [iso-8859-1] Sat Dec 12 08:32:56 2015 @@ -1,6 +1,6 @@ ======================== -ReactOS Version 0.3.x -Updated March 3, 2013 +ReactOS Version 0.4.x +Updated December 12, 2015 ======================== 1. What is ReactOS? Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake [iso-8859-1] Sat Dec 12 08:32:56 2015 @@ -21,7 +21,7 @@ set(KERNEL_VERSION_PATCH_LEVEL "0") set(COPYRIGHT_YEAR "2015") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") @@ -37,10 +37,10 @@ # get svn revision number set(REVISION "rUNKNOWN") set(KERNEL_VERSION_BUILD_HEX "0") -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") +if(EXISTS "${REACTOS_SOURCE_DIR}/.svn" OR EXISTS "${REACTOS_SOURCE_DIR}/../.svn") find_package(Subversion) if(Subversion_FOUND) - subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO) + subversion_wc_info(${REACTOS_SOURCE_DIR} SVNINFO) if(SVNINFO_WC_REVISION) set(REVISION "r${SVNINFO_WC_REVISION}") converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX)

1 0

[tfaber] 70324: [VERSION] - Properly determine SVN revision. We can't expect .svn folders to exist in each subdir anymore.
by tfaber＠svn.reactos.org 12 Dec '15

12 Dec '15

Author: tfaber Date: Sat Dec 12 08:27:07 2015 New Revision: 70324 URL: http://svn.reactos.org/svn/reactos?rev=70324&view=rev Log: [VERSION] - Properly determine SVN revision. We can't expect .svn folders to exist in each subdir anymore. Modified: trunk/reactos/include/reactos/version.cmake Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Sat Dec 12 08:27:07 2015 @@ -37,10 +37,10 @@ # get svn revision number set(REVISION "rUNKNOWN") set(KERNEL_VERSION_BUILD_HEX "0") -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") +if(EXISTS "${REACTOS_SOURCE_DIR}/.svn" OR EXISTS "${REACTOS_SOURCE_DIR}/../.svn") find_package(Subversion) if(Subversion_FOUND) - subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO) + subversion_wc_info(${REACTOS_SOURCE_DIR} SVNINFO) if(SVNINFO_WC_REVISION) set(REVISION "r${SVNINFO_WC_REVISION}") converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX)

1 0

[pschweitzer] 70323: [TCPIP] Fix the last failing tests of iphlpapi_apitest:SendARP
by pschweitzer＠svn.reactos.org 11 Dec '15

11 Dec '15

Author: pschweitzer Date: Fri Dec 11 22:30:02 2015 New Revision: 70323 URL: http://svn.reactos.org/svn/reactos?rev=70323&view=rev Log: [TCPIP] Fix the last failing tests of iphlpapi_apitest:SendARP Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Dec 11 22:30:02 2015 @@ -1645,7 +1645,7 @@ PVOID OutputBuffer; if (NCE->LinkAddressLength > WorkItem->IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_INVALID_BUFFER_SIZE; + Status = STATUS_INSUFFICIENT_RESOURCES; } else { OutputBuffer = Irp->AssociatedIrp.SystemBuffer; RtlCopyMemory(OutputBuffer, NCE->LinkAddress, NCE->LinkAddressLength); @@ -1691,13 +1691,8 @@ if (Interface) { PVOID OutputBuffer; - if (!AddrIsUnspecified(&Local) && IPs[0] != IPs[1]) { - Status = STATUS_UNSUCCESSFUL; - goto Exit; - } - if (Interface->AddressLength > IrpSp->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_INVALID_BUFFER_SIZE; + Status = STATUS_INSUFFICIENT_RESOURCES; goto Exit; } @@ -1720,8 +1715,11 @@ else { Interface = AddrLocateInterface(&Local); if (Interface == NULL) { - Status = STATUS_NETWORK_UNREACHABLE; - goto Exit; + Interface = GetDefaultInterface(); + if (Interface == NULL) { + Status = STATUS_NETWORK_UNREACHABLE; + goto Exit; + } } }

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