Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BUTTONVISTEST] Add visual tests for buttons
by Giannis Adamopoulos 22 Nov '17

22 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4d691ba969d796acebfe… commit b4d691ba969d796acebfed01649498bc437914b0 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Nov 22 11:14:49 2017 +0200 [BUTTONVISTEST] Add visual tests for buttons --- modules/rostests/win32/CMakeLists.txt | 1 + modules/rostests/win32/comctl32/CMakeLists.txt | 1 + .../rostests/win32/comctl32/buttonvistest/143.bmp | Bin 0 -> 2054 bytes .../rostests/win32/comctl32/buttonvistest/225.bmp | Bin 0 -> 6198 bytes .../win32/comctl32/buttonvistest/CMakeLists.txt | 4 + .../win32/comctl32/buttonvistest/Win32Project1.ico | Bin 0 -> 46227 bytes .../win32/comctl32/buttonvistest/buttonvistest.cpp | 419 +++++++++++++++++++++ .../win32/comctl32/buttonvistest/buttonvistest.rc | 65 ++++ .../win32/comctl32/buttonvistest/comctl6.manifest | 25 ++ .../win32/comctl32/buttonvistest/resource.h | 38 ++ .../win32/comctl32/buttonvistest/small.ico | Bin 0 -> 46227 bytes 11 files changed, 553 insertions(+) diff --git a/modules/rostests/win32/CMakeLists.txt b/modules/rostests/win32/CMakeLists.txt index 7fc9c96f73..bf71c98beb 100644 --- a/modules/rostests/win32/CMakeLists.txt +++ b/modules/rostests/win32/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(advapi32) add_subdirectory(cmd) +add_subdirectory(comctl32) add_subdirectory(kernel32) add_subdirectory(user32) diff --git a/modules/rostests/win32/comctl32/CMakeLists.txt b/modules/rostests/win32/comctl32/CMakeLists.txt new file mode 100644 index 0000000000..28bb44b288 --- /dev/null +++ b/modules/rostests/win32/comctl32/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(buttonvistest) diff --git a/modules/rostests/win32/comctl32/buttonvistest/143.bmp b/modules/rostests/win32/comctl32/buttonvistest/143.bmp new file mode 100644 index 0000000000..f1a0b199ab Binary files /dev/null and b/modules/rostests/win32/comctl32/buttonvistest/143.bmp differ diff --git a/modules/rostests/win32/comctl32/buttonvistest/225.bmp b/modules/rostests/win32/comctl32/buttonvistest/225.bmp new file mode 100644 index 0000000000..66d2e4f682 Binary files /dev/null and b/modules/rostests/win32/comctl32/buttonvistest/225.bmp differ diff --git a/modules/rostests/win32/comctl32/buttonvistest/CMakeLists.txt b/modules/rostests/win32/comctl32/buttonvistest/CMakeLists.txt new file mode 100644 index 0000000000..16a707dd39 --- /dev/null +++ b/modules/rostests/win32/comctl32/buttonvistest/CMakeLists.txt @@ -0,0 +1,4 @@ +add_executable(buttonvistest buttonvistest.cpp buttonvistest.rc) +set_module_type(buttonvistest win32gui UNICODE) +add_delay_importlibs(buttonvistest comctl32) +add_importlibs(buttonvistest uxtheme user32 gdi32 advapi32 msvcrt kernel32) diff --git a/modules/rostests/win32/comctl32/buttonvistest/Win32Project1.ico b/modules/rostests/win32/comctl32/buttonvistest/Win32Project1.ico new file mode 100644 index 0000000000..b3ec03bd61 Binary files /dev/null and b/modules/rostests/win32/comctl32/buttonvistest/Win32Project1.ico differ diff --git a/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp new file mode 100644 index 0000000000..4249a53ee8 --- /dev/null +++ b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.cpp @@ -0,0 +1,419 @@ +#include <windows.h> +#include <uxtheme.h> +#include <stdlib.h> +#include <tchar.h> +#include "resource.h" + +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); + +HICON hico; +HBITMAP hbmp; +HIMAGELIST himl; +POINT scPos; + +HBRUSH hbrNULL; +HBRUSH hbrRed; +HBRUSH hbrGreen; +HBRUSH hbrBlue; +HBRUSH hbrCyan; +HBRUSH hbrYellow; + +HBRUSH hbrCtlColorStatic; +HBRUSH hbrCtlColorBtn; +HBRUSH hbrPrintClientClear; +HBRUSH hbrErase; + +BOOL bSkipErase; +BOOL bSkipPaint; + +static void RegisterMyClass(HINSTANCE hInst) +{ + WNDCLASSEXW wcex; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInst; + wcex.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_WIN32PROJECT1)); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = NULL; + wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_MENU); + wcex.lpszClassName = L"ButtonTests"; + wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); + + RegisterClassExW(&wcex); +} + +#define TOP_MARGIN 50 +#define LEFT_MARGIN 160 +#define X_GAP 10 +#define Y_GAP 10 +#define Y_HEIGHT 40 +#define X_WIDTH 150 + +static HWND CreateWnd(HWND hWnd, LPCWSTR Class, LPCWSTR Text, LONG style, int i, int j) +{ + return CreateWindowW(Class, + Text, + style | WS_CHILD | WS_VISIBLE, + LEFT_MARGIN + (X_GAP + X_WIDTH) * i, + TOP_MARGIN + ((Y_GAP + Y_HEIGHT) *j), + X_WIDTH, + Y_HEIGHT, + hWnd, NULL, NULL, NULL); +} + +static HWND CreateBtn(HWND hWnd, LPCWSTR Text, LONG style, int i, int j) +{ + WCHAR buffer[100]; + SIZE s; + + HWND ret = CreateWnd(hWnd, L"Button", Text, style, i, j); + if (GetWindowLongW(ret, GWL_STYLE) != (style | WS_CHILD | WS_VISIBLE)) + { + swprintf(buffer, L"expected 0x%x got 0x%x", (style | WS_CHILD | WS_VISIBLE), GetWindowLongW(ret, GWL_STYLE)); + MessageBox(0, buffer, L"error", MB_OK); + } + + if (SendMessageW(ret, BCM_GETIDEALSIZE, 0, (LPARAM)&s)) + { + swprintf(buffer, L"%s (%d, %d)", Text, s.cx, s.cy); + SendMessageW(ret, WM_SETTEXT, 0, (LPARAM)buffer); + } + return ret; +} + +static void CreateButtonSet(HWND hwndParent, HWND *ahwnd, int i, int j, DWORD style) +{ + ahwnd[0] = CreateBtn(hwndParent, L"TestButton", style, i, j + 0); + ahwnd[1] = CreateBtn(hwndParent, L"TestButton1", style, i, j + 1); + ahwnd[2] = CreateBtn(hwndParent, L"TestButton2", style, i, j + 2); + ahwnd[3] = CreateBtn(hwndParent, L"TestButton3", style | BS_BITMAP, i, j + 3); + ahwnd[4] = CreateBtn(hwndParent, L"TestButton4", style | BS_ICON, i, j + 4); + + SendMessageW(ahwnd[1], BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageW(ahwnd[2], BM_SETIMAGE, IMAGE_ICON, (LPARAM)hico); + + SendMessageW(ahwnd[3], BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageW(ahwnd[4], BM_SETIMAGE, IMAGE_ICON, (LPARAM)hico); +} + +int WINAPI wWinMain(_In_ HINSTANCE hInstance, + _In_opt_ HINSTANCE hPrevInstance, + _In_ LPWSTR lpCmdLine, + _In_ int nCmdShow) +{ + HWND hwnd[200]; + HANDLE hActCtx; + ULONG_PTR cookie; + BOOL bActivated; + + ACTCTXW actctx = { sizeof(actctx) }; + actctx.hModule = hInstance; + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID| ACTCTX_FLAG_HMODULE_VALID; + actctx.lpResourceName = MAKEINTRESOURCEW(500); + hActCtx = CreateActCtxW(&actctx); + + hico = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WIN32PROJECT1)); + hbmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_BITMAP1)); + + scPos.x = 0; + scPos.y = 0; + + hbrNULL = (HBRUSH)GetStockObject (NULL_BRUSH); + hbrRed = CreateSolidBrush(0x00000FF); + hbrGreen = CreateSolidBrush(0x0000FF00); + hbrBlue = CreateSolidBrush(0x00FF0000); + hbrCyan = CreateSolidBrush(0x00FFFF00); + hbrYellow = CreateSolidBrush(0x0000FFFF); + + hbrCtlColorStatic = hbrRed; + hbrCtlColorBtn = hbrCyan; + hbrPrintClientClear = hbrYellow; + hbrErase = hbrGreen; + + bSkipErase = FALSE; + bSkipPaint = FALSE; + + RegisterMyClass(hInstance); + + HWND hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"ButtonTests", L"Button tests", WS_OVERLAPPEDWINDOW| WS_HSCROLL| WS_VSCROLL, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL); + + CreateWnd(hWnd, L"Static", L"no images", 0, -1, 0); + CreateWnd(hWnd, L"Static", L"with BM_SETIMAGE", 0, -1, 1); + CreateWnd(hWnd, L"Static", L"with BM_SETIMAGE", 0, -1, 2); + CreateWnd(hWnd, L"Static", L"with BM_SETIMAGE and BS_BITMAP", 0, -1, 3); + CreateWnd(hWnd, L"Static", L"with BM_SETIMAGE and BS_ICON", 0, -1, 4); + + CreateWnd(hWnd, L"Static", L"Button V5", 0, 0, -1); + CreateButtonSet(hWnd, &hwnd[0], 0, 0, BS_PUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[5], 1, 0, BS_DEFPUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[10], 0, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[15], 1, 5, BS_GROUPBOX); + CreateButtonSet(hWnd, &hwnd[20], 0, 10, BS_CHECKBOX); + CreateButtonSet(hWnd, &hwnd[25], 1, 10, BS_RADIOBUTTON); + + bActivated = ActivateActCtx(hActCtx, &cookie); + LoadLibraryW(L"comctl32.dll"); + + himl = ImageList_LoadImageW(hInstance, MAKEINTRESOURCEW(IDB_BITMAP2), 16, 0, CLR_DEFAULT, IMAGE_BITMAP, LR_CREATEDIBSECTION); + BUTTON_IMAGELIST btniml = {himl, {1,1,1,1}, BUTTON_IMAGELIST_ALIGN_LEFT}; + + CreateWnd(hWnd, L"Static", L"Button V6 without themes", 0, 2, -1); + CreateButtonSet(hWnd, &hwnd[30], 2, 0, BS_PUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[35], 3, 0, BS_DEFPUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[40], 2, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[55], 3, 5, BS_GROUPBOX); + CreateButtonSet(hWnd, &hwnd[50], 2, 10, BS_CHECKBOX); + CreateButtonSet(hWnd, &hwnd[55], 3, 10, BS_RADIOBUTTON); + + CreateWnd(hWnd, L"Static", L"Button V6 with imagelist and no themes", 0, 4, -1); + CreateButtonSet(hWnd, &hwnd[60], 4, 0, BS_PUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[65], 5, 0, BS_DEFPUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[70], 4, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[75], 5, 5, BS_GROUPBOX); + CreateButtonSet(hWnd, &hwnd[80], 4, 10, BS_CHECKBOX); + CreateButtonSet(hWnd, &hwnd[85], 5, 10, BS_RADIOBUTTON); + + for (int i = 30; i < 90; i++) + SetWindowTheme(hwnd[i], L"", L""); + + for (int i = 60; i< 90; i++) + SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); + + CreateWnd(hWnd, L"Static", L"Button V6 with themes and imagelist", 0, 6, -1); + CreateButtonSet(hWnd, &hwnd[120], 6, 0, BS_PUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[125], 7, 0, BS_DEFPUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[130], 6, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[135], 7, 5, BS_GROUPBOX); + CreateButtonSet(hWnd, &hwnd[140], 6, 10, BS_CHECKBOX); + CreateButtonSet(hWnd, &hwnd[145], 7, 10, BS_RADIOBUTTON); + + CreateWnd(hWnd, L"Static", L"Button V6 with themes", 0, 8, -1); + CreateButtonSet(hWnd, &hwnd[90], 8, 0, BS_PUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[95], 9, 0, BS_DEFPUSHBUTTON); + CreateButtonSet(hWnd, &hwnd[100], 8, 5, BS_PUSHBUTTON|WS_DISABLED); + CreateButtonSet(hWnd, &hwnd[105], 9, 5, BS_GROUPBOX); + CreateButtonSet(hWnd, &hwnd[110], 8, 10, BS_CHECKBOX); + CreateButtonSet(hWnd, &hwnd[115], 9, 10, BS_RADIOBUTTON); + + for (int i = 120; i< 150; i++) + SendMessageW(hwnd[i], BCM_SETIMAGELIST, 0, (LPARAM)&btniml); + + if (bActivated) DeactivateActCtx(0, cookie); + + SCROLLINFO vsi = {sizeof(SCROLLINFO), SIF_ALL, 0, 2 * TOP_MARGIN + 10 * (Y_GAP + Y_HEIGHT), Y_HEIGHT, 0, 0}; + SCROLLINFO hsi = {sizeof(SCROLLINFO), SIF_ALL, 0, 2 * LEFT_MARGIN + 13 * (X_GAP + X_WIDTH), X_WIDTH, 0, 0}; + + SetScrollInfo(hWnd, SB_HORZ, &hsi, FALSE); + SetScrollInfo(hWnd, SB_VERT, &vsi, FALSE); + + ShowScrollBar(hWnd, SB_HORZ, TRUE); + ShowScrollBar(hWnd, SB_VERT, TRUE); + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + MSG msg; + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int) msg.wParam; +} + +static VOID +OnScroll(HWND hwnd, INT nBar, WORD sbCode) +{ + RECT rect; + + SCROLLINFO sInfo; + INT oldPos, Maximum; + PLONG pOriginXY; + + //ASSERT(nBar == SB_HORZ || nBar == SB_VERT); + + GetClientRect(hwnd, &rect); + + if (nBar == SB_HORZ) + { + Maximum =1000;//pData->cxMin - (rect.right-rect.left) /* pData->cxOld */; + pOriginXY = &scPos.x; + } + else // if (nBar == SB_VERT) + { + Maximum = 1000;//pData->cyMin - (rect.bottom-rect.top) /* pData->cyOld */; + pOriginXY = &scPos.y; + } + + /* Set scrollbar sizes */ + sInfo.cbSize = sizeof(sInfo); + sInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE | SIF_TRACKPOS; + + if (!GetScrollInfo(hwnd, nBar, &sInfo)) + return; + + oldPos = sInfo.nPos; + + switch (sbCode) + { + case SB_LINEUP: // SB_LINELEFT: + sInfo.nPos--; + break; + + case SB_LINEDOWN: // SB_LINERIGHT: + sInfo.nPos++; + break; + + case SB_PAGEUP: // SB_PAGELEFT: + sInfo.nPos -= sInfo.nPage; + break; + + case SB_PAGEDOWN: // SB_PAGERIGHT: + sInfo.nPos += sInfo.nPage; + break; + + case SB_THUMBTRACK: + sInfo.nPos = sInfo.nTrackPos; + break; + + case SB_THUMBPOSITION: + sInfo.nPos = sInfo.nTrackPos; + break; + + case SB_TOP: // SB_LEFT: + sInfo.nPos = sInfo.nMin; + break; + + case SB_BOTTOM: // SB_RIGHT: + sInfo.nPos = sInfo.nMax; + break; + + default: + break; + } + + sInfo.nPos = min(max(sInfo.nPos, 0), Maximum); + + if (oldPos != sInfo.nPos) + { + POINT scOldPos = scPos; + + /* We now modify scPos */ + *pOriginXY = sInfo.nPos; + + ScrollWindowEx(hwnd, + (scOldPos.x - scPos.x), + (scOldPos.y - scPos.y), + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN); + + sInfo.fMask = SIF_POS; + SetScrollInfo(hwnd, nBar, &sInfo, TRUE); + } +} + +LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rc = {0,0,5000,5000}; + switch (message) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_CTLCOLORSTATIC: + return (LRESULT)hbrCtlColorStatic; + case WM_CTLCOLORBTN: + return (LRESULT)hbrCtlColorBtn; + case WM_ERASEBKGND: + FillRect((HDC)wParam, &rc, hbrErase); + return TRUE; + case WM_PRINTCLIENT: + FillRect((HDC)wParam, &rc, hbrPrintClientClear); + break; + case WM_HSCROLL: + OnScroll(hWnd, SB_HORZ, LOWORD(wParam)); + break; + case WM_VSCROLL: + OnScroll(hWnd, SB_VERT, LOWORD(wParam)); + break; + case WM_DRAWITEM : + { + DRAWITEMSTRUCT* di = (DRAWITEMSTRUCT*)lParam; + INT oldBkMode; + INT state = (di->itemState == ODS_SELECTED) ? DFCS_BUTTONPUSH|DFCS_PUSHED : DFCS_BUTTONPUSH; + DrawFrameControl( di->hDC, &di->rcItem, DFC_BUTTON, state ); + oldBkMode = SetBkMode(di->hDC, TRANSPARENT); + DrawTextW(di->hDC, L"Ownder drawn text", -1, &di->rcItem, DT_VCENTER | DT_CENTER); + SetBkMode(di->hDC, oldBkMode); + break; + } + case WM_NOTIFY: + { + NMHDR* phdr = (NMHDR*)lParam; + if (phdr->code == NM_CUSTOMDRAW) + { + LPNMCUSTOMDRAW lpNMCustomDraw = (LPNMCUSTOMDRAW) lParam; + if (lpNMCustomDraw->dwDrawStage == CDDS_PREERASE && bSkipErase) + return CDRF_SKIPDEFAULT; + else if (lpNMCustomDraw->dwDrawStage == CDDS_PREPAINT && bSkipPaint) + return CDRF_SKIPDEFAULT; + return CDRF_DODEFAULT; + } + } + case WM_COMMAND: + { + UINT id = LOWORD(wParam); + switch(id) + { + case IDM_NULL_WIN: hbrErase = hbrNULL; break; + case IDM_RED_WIN: hbrErase = hbrRed; break; + case IDM_GREEN_WIN: hbrErase = hbrGreen; break; + case IDM_BLUE_WIN: hbrErase = hbrBlue; break; + case IDM_YELLOW_WIN: hbrErase = hbrYellow; break; + case IDM_CYAN_WIN: hbrErase = hbrCyan; break; + + case IDM_NULL_STATIC: hbrCtlColorStatic = hbrNULL; break; + case IDM_RED_STATIC: hbrCtlColorStatic = hbrRed; break; + case IDM_GREEN_STATIC: hbrCtlColorStatic = hbrGreen; break; + case IDM_BLUE_STATIC: hbrCtlColorStatic = hbrBlue; break; + case IDM_YELLOW_STATIC: hbrCtlColorStatic = hbrYellow; break; + case IDM_CYAN_STATIC: hbrCtlColorStatic = hbrCyan; break; + + case IDM_NULL_BTN: hbrCtlColorBtn = hbrNULL; break; + case IDM_RED_BTN: hbrCtlColorBtn = hbrRed; break; + case IDM_GREEN_BTN: hbrCtlColorBtn = hbrGreen; break; + case IDM_BLUE_BTN: hbrCtlColorBtn = hbrBlue; break; + case IDM_YELLOW_BTN: hbrCtlColorBtn = hbrYellow; break; + case IDM_CYAN_BTN: hbrCtlColorBtn = hbrCyan; break; + + case IDM_NULL_PRINTCLNT: hbrPrintClientClear = hbrNULL; break; + case IDM_RED_PRINTCLNT: hbrPrintClientClear = hbrRed; break; + case IDM_GREEN_PRINTCLNT: hbrPrintClientClear = hbrGreen; break; + case IDM_BLUE_PRINTCLNT: hbrPrintClientClear = hbrBlue; break; + case IDM_YELLOW_PRINTCLNT: hbrPrintClientClear = hbrYellow; break; + case IDM_CYAN_PRINTCLNT: hbrPrintClientClear = hbrCyan; break; + + case IDM_SKIP_ERASE: bSkipErase = !bSkipErase; break; + case IDM_SKIP_PAINT: bSkipPaint = !bSkipPaint; break; + default: + return 0; + } + + InvalidateRect(hWnd, NULL, TRUE); + break; + } + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; +} diff --git a/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.rc b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.rc new file mode 100644 index 0000000000..f9f8076795 --- /dev/null +++ b/modules/rostests/win32/comctl32/buttonvistest/buttonvistest.rc @@ -0,0 +1,65 @@ +#include <windows.h> +#include <resource.h> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDI_WIN32PROJECT1 ICON "Win32Project1.ico" +IDI_SMALL ICON "small.ico" + +500 RT_MANIFEST "comctl6.manifest" + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Win32Project1" + IDC_WIN32PROJECT1 "WIN32PROJECT1" +END + +IDB_BITMAP1 BITMAP "143.bmp" +IDB_BITMAP2 BITMAP "225.bmp" + +IDC_MENU MENU +BEGIN + POPUP "Colours" + BEGIN + POPUP "Window brush" + BEGIN + MENUITEM "NULL_BRUSH", IDM_NULL_WIN + MENUITEM "Red", IDM_RED_WIN + MENUITEM "Green", IDM_GREEN_WIN + MENUITEM "Blue", IDM_BLUE_WIN + MENUITEM "Yellow", IDM_YELLOW_WIN + MENUITEM "Cyan", IDM_CYAN_WIN + END + POPUP "CTLCOLORSTATIC" + BEGIN + MENUITEM "NULL_BRUSH", IDM_NULL_STATIC + MENUITEM "Red", IDM_RED_STATIC + MENUITEM "Green", IDM_GREEN_STATIC + MENUITEM "Blue", IDM_BLUE_STATIC + MENUITEM "Yellow", IDM_YELLOW_STATIC + MENUITEM "Cyan", IDM_CYAN_STATIC + END + POPUP "CTLCOLORBTN" + BEGIN + MENUITEM "NULL_BRUSH", IDM_NULL_BTN + MENUITEM "Red", IDM_RED_BTN + MENUITEM "Green", IDM_GREEN_BTN + MENUITEM "Blue", IDM_BLUE_BTN + MENUITEM "Yellow", IDM_YELLOW_BTN + MENUITEM "Cyan", IDM_CYAN_BTN + END + POPUP "PRINTCLIENT clear" + BEGIN + MENUITEM "NULL_BRUSH", IDM_NULL_PRINTCLNT + MENUITEM "Red", IDM_RED_PRINTCLNT + MENUITEM "Green", IDM_GREEN_PRINTCLNT + MENUITEM "Blue", IDM_BLUE_PRINTCLNT + MENUITEM "Yellow", IDM_YELLOW_PRINTCLNT + MENUITEM "Cyan", IDM_CYAN_PRINTCLNT + END + END + POPUP "Skip" + BEGIN + MENUITEM "Skip erase", IDM_SKIP_ERASE + MENUITEM "Skip paint", IDM_SKIP_PAINT + END +END \ No newline at end of file diff --git a/modules/rostests/win32/comctl32/buttonvistest/comctl6.manifest b/modules/rostests/win32/comctl32/buttonvistest/comctl6.manifest new file mode 100644 index 0000000000..be8743f727 --- /dev/null +++ b/modules/rostests/win32/comctl32/buttonvistest/comctl6.manifest @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + publicKeyToken="6595b64144ccf1df" + processorArchitecture="*" + language="*" + /> + </dependentAssembly> +</dependency> +<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + uiAccess="false" + /> + </requestedPrivileges> + </security> +</trustInfo> +</assembly> diff --git a/modules/rostests/win32/comctl32/buttonvistest/resource.h b/modules/rostests/win32/comctl32/buttonvistest/resource.h new file mode 100644 index 0000000000..1b271d0a60 --- /dev/null +++ b/modules/rostests/win32/comctl32/buttonvistest/resource.h @@ -0,0 +1,38 @@ +#define IDI_WIN32PROJECT1 107 +#define IDI_SMALL 108 +#define IDS_APP_TITLE 103 +#define IDC_WIN32PROJECT1 109 +#define IDB_BITMAP1 130 +#define IDB_BITMAP2 131 +#define IDC_MENU 140 + +#define IDM_NULL_WIN 200 +#define IDM_RED_WIN 201 +#define IDM_GREEN_WIN 202 +#define IDM_BLUE_WIN 203 +#define IDM_YELLOW_WIN 204 +#define IDM_CYAN_WIN 205 + +#define IDM_NULL_STATIC 206 +#define IDM_RED_STATIC 207 +#define IDM_GREEN_STATIC 208 +#define IDM_BLUE_STATIC 209 +#define IDM_YELLOW_STATIC 210 +#define IDM_CYAN_STATIC 211 + +#define IDM_NULL_BTN 212 +#define IDM_RED_BTN 213 +#define IDM_GREEN_BTN 214 +#define IDM_BLUE_BTN 215 +#define IDM_YELLOW_BTN 216 +#define IDM_CYAN_BTN 217 + +#define IDM_NULL_PRINTCLNT 218 +#define IDM_RED_PRINTCLNT 219 +#define IDM_GREEN_PRINTCLNT 220 +#define IDM_BLUE_PRINTCLNT 221 +#define IDM_YELLOW_PRINTCLNT 222 +#define IDM_CYAN_PRINTCLNT 223 + +#define IDM_SKIP_ERASE 250 +#define IDM_SKIP_PAINT 251 diff --git a/modules/rostests/win32/comctl32/buttonvistest/small.ico b/modules/rostests/win32/comctl32/buttonvistest/small.ico new file mode 100644 index 0000000000..b3ec03bd61 Binary files /dev/null and b/modules/rostests/win32/comctl32/buttonvistest/small.ico differ

1 0

[reactos] 01/01: [CMD] Update the documentation of the FOR command. CORE-5806
by Hermès Bélusca-Maïto 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=748c87202c6a6ed717059… commit 748c87202c6a6ed717059c72224d44487b40f678 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 21 23:45:54 2017 +0100 [CMD] Update the documentation of the FOR command. CORE-5806 - Also update & translate the french translation. - Translators, please verify & update the translations! --- base/shell/cmd/cmd.rc | 2 +- base/shell/cmd/lang/cs-CZ.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/de-DE.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/el-GR.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/en-US.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/es-ES.rc | 25 ++++++++++++++++++++----- base/shell/cmd/lang/fr-FR.rc | 37 ++++++++++++++++++++++++++----------- base/shell/cmd/lang/hu-HU.rc | 21 +++++++++++++++++---- base/shell/cmd/lang/id-ID.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/it-IT.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/ja-JP.rc | 21 +++++++++++++++++---- base/shell/cmd/lang/no-NO.rc | 21 +++++++++++++++++---- base/shell/cmd/lang/pl-PL.rc | 25 +++++++++++++++++++------ base/shell/cmd/lang/ro-RO.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/ru-RU.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/sk-SK.rc | 19 ++++++++++++++++--- base/shell/cmd/lang/sq-AL.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/sv-SE.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/tr-TR.rc | 21 +++++++++++++++++---- base/shell/cmd/lang/uk-UA.rc | 25 +++++++++++++++++++------ base/shell/cmd/lang/zh-CN.rc | 23 ++++++++++++++++++----- base/shell/cmd/lang/zh-TW.rc | 23 ++++++++++++++++++----- 22 files changed, 375 insertions(+), 98 deletions(-) diff --git a/base/shell/cmd/cmd.rc b/base/shell/cmd/cmd.rc index ba8e0a62ac..3c4ae061fc 100644 --- a/base/shell/cmd/cmd.rc +++ b/base/shell/cmd/cmd.rc @@ -91,4 +91,4 @@ END #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 447bf2a0f9..1c8c84d865 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -216,12 +216,25 @@ Type ECHO without a parameter to display the current ECHO setting." /B Exits a batch file only. \n\ If run outside of a batch file it will exit cmd.exe\n\ ExitCode This value will be assigned to ERRORLEVEL on exit\n" - STRING_FOR_HELP1 "Runs a specified command for each file in a set of files\n\n\ -FOR %variable IN (set) DO command [parameters]\n\n\ + STRING_FOR_HELP1 "Runs a specified command for each file in a set of files.\n\n\ +FOR %variable IN (set) DO command [parameters]\n\ +FOR /L %variable IN (start,step,end) DO command [parameters]\n\ +FOR /D %variable IN (set) DO command [parameters]\n\ +FOR /R [[drive:]path] IN (set) DO command [parameters]\n\ +FOR /F [""options""] IN (set) DO command [parameters]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Specifies a replaceable parameter.\n\ (set) Specifies a set of one or more files. Wildcards may be used.\n\ command Specifies the command to carry out for each file.\n\ - parameters Specifies parameters or switches for the specified command.\n\n\ + parameters Specifies parameters or switches for the specified command.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ %variable.\n" STRING_FREE_HELP1 "\nVolume in drive %s is %-11s\n\ diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 9b243a23e7..9067bdd5ba 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -209,12 +209,25 @@ ECHO ohne Parameter zeigt die aktuelle Einstellung der Befehlsanzeige an." STRING_ECHO_HELP5 "ECHO ist %s\n" STRING_EXIT_HELP "Beendet den Befehlsinterpreter CMD.EXE oder die aktuelle Batchdatei.\n\nEXIT" STRING_FOR_HELP1 "Führt einen Befehl für jede einzelne Datei für einen Satz von Dateien aus.\n\n\ -FOR %Variable IN (Satz) DO Befehl [Parameter]\n\n\ - %variable Ein ersetzbarer Parameter bestehend aus einem einzelnen\n\ - Buchstaben.\n\ +FOR %Variable IN (Satz) DO Befehl [Parameter]\n\ +FOR /L %Variable IN (start,step,end) DO Befehl [Parameter]\n\ +FOR /D %Variable IN (Satz) DO Befehl [Parameter]\n\ +FOR /R [[drive:]path] IN (Satz) DO Befehl [Parameter]\n\ +FOR /F [""options""] IN (Satz) DO Befehl [Parameter]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %Variable Ein ersetzbarer Parameter bestehend aus einem einzelnen\n\ + Buchstaben.\n\ (Satz) Ein Satz von mindestens einer Datei. Platzhalter sind zulässig.\n\ - Befehl Befehl, der für jede Datei ausgeführt werden soll.\n\ - Parameter Parameter und Optionen für den angegebenen Befehl.\n\n\ + Befehl Befehl, der für jede Datei ausgeführt werden soll.\n\ + Parameter Parameter und Optionen für den angegebenen Befehl.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ Um den FOR-Befehl in einem Batchprogramm zu verwenden, geben Sie %%Variable\n\ statt %Variable an." STRING_FREE_HELP1 "\nVolume in Laufwerk %s ist %-11s\n\ diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 5c1a7af8c4..2ce0815966 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -215,12 +215,25 @@ Type ECHO without a parameter to display the current ECHO setting." /B Exits a batch file only. \n\ If run outside of a batch file it will exit cmd.exe\n\ ExitCode This value will be assigned to ERRORLEVEL on exit\n" - STRING_FOR_HELP1 "Runs a specified command for each file in a set of files\n\n\ -FOR %variable IN (set) DO command [parameters]\n\n\ + STRING_FOR_HELP1 "Runs a specified command for each file in a set of files.\n\n\ +FOR %variable IN (set) DO command [parameters]\n\ +FOR /L %variable IN (start,step,end) DO command [parameters]\n\ +FOR /D %variable IN (set) DO command [parameters]\n\ +FOR /R [[drive:]path] IN (set) DO command [parameters]\n\ +FOR /F [""options""] IN (set) DO command [parameters]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Specifies a replaceable parameter.\n\ (set) Specifies a set of one or more files. Wildcards may be used.\n\ command Specifies the command to carry out for each file.\n\ - parameters Specifies parameters or switches for the specified command.\n\n\ + parameters Specifies parameters or switches for the specified command.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ %variable.\n" STRING_FREE_HELP1 "\nVolume in drive %s is %-11s\n\ diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index cbbfa2bf17..c0f16a2764 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -211,12 +211,25 @@ Type ECHO without a parameter to display the current ECHO setting." /B Exits a batch file only. \n\ If run outside of a batch file it will exit cmd.exe\n\ ExitCode This value will be assigned to ERRORLEVEL on exit\n" - STRING_FOR_HELP1 "Runs a specified command for each file in a set of files\n\n\ -FOR %variable IN (set) DO command [parameters]\n\n\ + STRING_FOR_HELP1 "Runs a specified command for each file in a set of files.\n\n\ +FOR %variable IN (set) DO command [parameters]\n\ +FOR /L %variable IN (start,step,end) DO command [parameters]\n\ +FOR /D %variable IN (set) DO command [parameters]\n\ +FOR /R [[drive:]path] IN (set) DO command [parameters]\n\ +FOR /F [""options""] IN (set) DO command [parameters]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Specifies a replaceable parameter.\n\ (set) Specifies a set of one or more files. Wildcards may be used.\n\ command Specifies the command to carry out for each file.\n\ - parameters Specifies parameters or switches for the specified command.\n\n\ + parameters Specifies parameters or switches for the specified command.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ %variable.\n" STRING_FREE_HELP1 "\nVolume in drive %s is %-11s\n\ diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 7ac8700c04..1fe5466f5f 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -214,13 +214,28 @@ Escribe ECHO sin parámetros para mostrar la configuración actual de ECHO." STRING_ECHO_HELP5 "ECHO está %s\n" STRING_EXIT_HELP "Sale del interprete de la linea de comandos.\n\nEXIT\n" STRING_FOR_HELP1 "Ejecuta un comando específico para cada archivo de un grupo de archivos.\n\n\ -FOR %variable IN (grupo) DO comando [parametros]\n\n\ +FOR %variable IN (grupo) DO comando [parametros]\n\ +FOR /L %variable IN (start,step,end) DO comando [parametros]\n\ +FOR /D %variable IN (grupo) DO comando [parametros]\n\ +FOR /R [[drive:]path] IN (grupo) DO comando [parametros]\n\ +FOR /F [""options""] IN (grupo) DO comando [parametros]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Especifica un parámetro remplazable.\n\ - (set) Especifica un grupo de uno o mas archivos. Los comodines pueden usarse.\n\ + (set) Especifica un grupo de uno o mas archivos. Los comodines pueden\n\ + usarse.\n\ command Especifica el comando a ejecutar para cada archivo.\n\ - parameters Especifica los parametros o modificadores para el comando especificado.\n\n\ -Para usar el comando FOR en un archivo por lotes, especifica %%variable en lugar de\n\ -%variable.\n" + parameters Especifica los parametros o modificadores para el comando\n\ + especificado.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +Para usar el comando FOR en un archivo por lotes, especifica %%variable en lugar\n\ +de %variable.\n" STRING_FREE_HELP1 "\nEl volumen en la unidad %s es %-11s\n\ El número de serie es %s\n\ %16s bytes totales de espacio en disco\n\ diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 303304fa68..4a8add0a3e 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -226,15 +226,30 @@ Taper ECHO sans paramètre pour afficher le réglage ECHO courant." /B Quitte seulement un fichier batch. \n\ En cas de lancement en dehors d'un fichier batch, cmd.exe sera quittée\n\ CodeDeFin ERRORLEVEL prendra cette valeur à la sortie\n" - STRING_FOR_HELP1 "Exécute une commande donnée pour chaque fichier d'un ensemble de fichiers.\n\ -FOR %variable IN (ensemble) do commande [paramètres]\n\n\ - %variable Spécife un paramètre remplaçable.\n\ - (ensemble) Spécifie un ensemble d'un ou plusieurs fichiers.\n\ - Des jokers peuvent être utilisés.\n\ - commande Spécifie la commande à éxécuter pour chaque fichier.\n\ - paramètres Spécifie les paramètres ou switchs pour la commande spécifiée.\n\n\ -Pour utiliser la comamnde FOR dans un programme batch,\n\ -utiliser %%variable au lieu de %variable." + STRING_FOR_HELP1 "Exécute une commande donnée pour chaque fichier d'un ensemble de fichiers.\n\n\ +FOR %variable IN (ensemble) DO commande [paramètres]\n\ +FOR /L %variable IN (début,pas,fin) DO commande [paramètres]\n\ +FOR /D %variable IN (ensemble) DO commande [paramètres]\n\ +FOR /R [[lecteur:]chemin] IN (ensemble) DO commande [paramètres]\n\ +FOR /F [""options""] IN (ensemble) DO commande [paramètres]\n\n\ + /L Génère une séquence numérique allant de début à fin, incrémenté de pas.\n\ + /D L'ensemble se réfère à des répertoires au lieu de fichiers.\n\ + /R Exécute la commande pour les fichiers dans l'ensemble du répertoire\n\ + spécifié (ou bien le répertoire de travail courant si non spécifié)\n\ + ainsi que chaque sous-répertoire.\n\ + /F L'ensemble se réfère au contenu des fichiers de l'ensemble.\n\n\ + %variable Spécifie un paramètre remplaçable.\n\ + (ensemble) Spécifie un ensemble d'un ou plusieurs fichiers. Des caractères\n\ + jokers peuvent être utilisés.\n\ + commande Spécifie la commande à exécuter pour chaque fichier.\n\ + paramètres Spécifie les paramètres ou commutateurs pour la commande.\n\ + options Les options supportées sont : eol, skip, delims, tokens, et\n\ + usebackq.\n\n\ +Les paramètres remplaçables peuvent être modifiés par l'ajout d'un ~ et d'un\n\ +qualificateur optionnel après le % et avant le nom (par ex. %~X).\n\ +Les qualificateurs supportés sont : f,d,p,n,x,s,a,t,z.\n\n\ +Pour utiliser la comamnde FOR dans un programme batch, utiliser %%variable\n\ +au lieu de %variable." STRING_FREE_HELP1 "\nLe nom de volume du lecteur %s est %-11s\n\ Le numéro de série est %s\n\ %16s octets d'espace disque total\n\ @@ -301,7 +316,7 @@ prompt texte affiché par la boite de dialogue \n\n\n\ ERRORLEVEL est modifié suivant le bouton pressé:\n\n\ YES : 10 | NO : 11\n\ OK : 10 | CANCEL : 12\n" - STRING_PATH_HELP1 "Affiche ou modifie le chemin de recherche pour les fichiers éxécutables.\n\n\ + STRING_PATH_HELP1 "Affiche ou modifie le chemin de recherche pour les fichiers exécutables.\n\n\ PATH [[lecteur:][chemin;...]]\nPATH ;\n\n\ Taper PATH ; pour effacer tous les réglages courants\n\ et indiquer à l'interpréteur de commandes\n\ @@ -330,7 +345,7 @@ des caractères spéciaux suivants:\n\n\ $V Numéro de version de ReactOS\n\ $_ Retour chariot/saut de ligne\n\ $$ $ (signe dollar)" - STRING_PAUSE_HELP1 "Stoppe l'éxécution d'un fichier batch et affiche le message suivant:\n\ + STRING_PAUSE_HELP1 "Stoppe l'exécution d'un fichier batch et affiche le message suivant:\n\ 'Appuyer sur une touche pour continuer...' ou un message défini\n\ par l'utilisateur.\n\n\ PAUSE [message]" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index ef8bcd2ba0..7763adbe02 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -198,12 +198,25 @@ PUSHD [elérési_út | ..]\n\n\ Paraméter nélkül megjeleníti a visszang állapotát." STRING_ECHO_HELP5 "Az ECHO %s\n" STRING_EXIT_HELP "Kilép a parancssor értelmezõbõl.\n\nEXIT\n" - STRING_FOR_HELP1 "Végrehajt egy parancsot az összes fájlban a megadott mappákban\n\n\ -FOR %változó IN (csoport) DO parancs [paraméterek]\n\n\ + STRING_FOR_HELP1 "Végrehajt egy parancsot az összes fájlban a megadott mappákban.\n\n\ +FOR %változó IN (csoport) DO parancs [paraméterek]\n\ +FOR /L %változó IN (start,step,end) DO parancs [paraméterek]\n\ +FOR /D %változó IN (csoport) DO parancs [paraméterek]\n\ +FOR /R [[drive:]path] IN (csoport) DO parancs [paraméterek]\n\ +FOR /F [""options""] IN (csoport) DO parancs [paraméterek]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %változó A cserélhetõ paraméter.\n\ - (csoport) Állományok csoportja. Joker-karakterek megengedettek EZT KURVÁRA ÁTKELL FORDÍTANI :)) wildcardok helyett?.\n\ + (csoport) Állományok csoportja. Joker-karakterek megengedettek.\n\ parancs Ezt a parancsot hajtja végre minden egyes állománnyal.\n\ - paraméterek Ezeket a paramétereket adja meg a parancsnak.\n\n\ + paraméterek Ezeket a paramétereket adja meg a parancsnak.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ A batch állományban való haszálathoz %%változó kell a %változó helyett.\n" STRING_FREE_HELP1 "\nA (%s) meghajtóban lévõ kötet címkéje %-11s\n\ Sorozatszám: %s\n\ diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index b9b67d31fe..6fdfe505b3 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -213,12 +213,25 @@ Ketik ECHO tanpa parameter untuk menampilkan setelan ECHO saat ini." /B Keluar dari hanya file batch. \n\ Jika dijalankan di luar file batch ia akan keluar dari cmd.exe\n\ ExitCode Nilai ini akan ditempatkan ke ERRORLEVEL saat keluar\n" - STRING_FOR_HELP1 "Menjalankan perintah yang ditetapkan untuk setiap file dalam set file\n\n\ -FOR %variabel IN (set) DO perintah [parameter]\n\n\ + STRING_FOR_HELP1 "Menjalankan perintah yang ditetapkan untuk setiap file dalam set file.\n\n\ +FOR %variabel IN (set) DO perintah [parameter]\n\ +FOR /L %variabel IN (start,step,end) DO perintah [parameter]\n\ +FOR /D %variabel IN (set) DO perintah [parameter]\n\ +FOR /R [[drive:]path] IN (set) DO perintah [parameter]\n\ +FOR /F [""options""] IN (set) DO perintah [parameter]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variabel Menetapkan parameter yang bisa diganti.\n\ (set) Mentetapkan sebuah set dari satu atau lebih file. Wildcards boleh dipakai.\n\ perintah Menetapkan perintah yang dilakukan untuk setiap file.\n\ - parameter Menetapkan parameter atau saklar untuk perintah yang dieteapkan.\n\n\ + parameter Menetapkan parameter atau saklar untuk perintah yang dieteapkan.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ Untuk menggunakan perintah FOR dalam program batch, tetapkan %%variable daripada\n\ %variabel.\n" STRING_FREE_HELP1 "\nVolume di drive %s adalah %-11s\n\ diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 916dcfe856..2e4e360ae6 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -212,13 +212,26 @@ Usa ECHO senza parametri pr visualizzare lo stato attuale di ECHO." /B Esce solo dalle procedure batch.\n\ Se eseguito al di fuori di un batch esce da cmd.exe\n\ ExitCode Verrà assegnato a ERRORLEVEL" - STRING_FOR_HELP1 "Esegue un comand specifico per ogni file indicato\n\n\ -FOR %variabile IN (listafile) DO comando [parametri]\n\n\ + STRING_FOR_HELP1 "Esegue un comand specifico per ogni file indicato.\n\n\ +FOR %variabile IN (insieme) DO comando [parametri]\n\ +FOR /L %variabile IN (start,step,end) DO comando [parametri]\n\ +FOR /D %variabile IN (insieme) DO comando [parametri]\n\ +FOR /R [[drive:]path] IN (insieme) DO comando [parametri]\n\ +FOR /F [""options""] IN (insieme) DO comando [parametri]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variabile Indica un parametro sostituibile.\n\ - (listafile)Indica un insieme di uno o più file. Si possono usare i\ - caratteri jolly.\n\ + (insieme) Indica un insieme di uno o più file. Si possono usare i caratteri\n\ + jolly.\n\ comando Indica un comando da eseguire per ogni file.\n\ - parametri Indica i parametri o le selezioni per il comando.\n\n\ + parametri Indica i parametri o le selezioni per il comando.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ Per usare FOR in un batch usare %%variable invece di %variable.\n" STRING_FREE_HELP1 "\nIl Volume del disco %s è %-11s\n\ Il numero di serie è %s\n\ diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index eb84b25017..369b4a5a85 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -217,11 +217,24 @@ PUSHD [パス | ..]\n\n\ STRING_ECHO_HELP5 "ECHO は %s です。\n" STRING_EXIT_HELP "コマンドインタープリタを終了します。\n\nEXIT\n" STRING_FOR_HELP1 "指定されたコマンドをファイルセットの各ファイルに対して実行します。\n\n\ -FOR %%変数 IN (セット) DO コマンド [パラメータ]\n\n\ - %%変数単一文字の置き換え可能なパラメータを指定します。\n\ +FOR %変数 IN (セット) DO コマンド [パラメータ]\n\ +FOR /L %変数 IN (start,step,end) DO コマンド [パラメータ]\n\ +FOR /D %変数 IN (セット) DO コマンド [パラメータ]\n\ +FOR /R [[drive:]path] IN (セット) DO コマンド [パラメータ]\n\ +FOR /F [""options""] IN (セット) DO コマンド [パラメータ]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %変数単一文字の置き換え可能なパラメータを指定します。\n\ (セット) ファイルセットを指定します。ワイルドカードを使用できます。\n\ - コマンド各ファイルごとに実行するコマンドを指定します。\n\ - パラメータ指定されたコマンドのパラメータまたはスイッチを指定します。\n\n\ + コマンド各ファイルごとに実行するコマンドを指定します。\n\ + パラメータ指定されたコマンドのパラメータまたはスイッチを指定します。\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ バッチプログラムで FOR コマンドを使用するときは、%%変数の代わりに、\n\ %%%%変数を使用してください。\n" STRING_FREE_HELP1 "\nドライブ %c のボリュームラベルは %-11s です\n\ diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 0eb9439faf..b2aa73a3ef 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -211,12 +211,25 @@ Skriv ECHO uten parameter for å vise gjeldende ECHO innstillinger." /B Avslutt bare en batch fil. \n\ Hvis det kjøres en batch fil på utsiden vil den avslutte cmd.exe\n\ ExitCode Denne verdien vil bli utpekt til ERRORLEVEL ved avslutting\n" - STRING_FOR_HELP1 "Kjør en spesifisert kommando for hver fil i en gruppe med filer\n\n\ -FOR %variabel IN (gruppe) DO kommando [parametere]\n\n\ - %variable Angir en erstattelig parameter.\n\ + STRING_FOR_HELP1 "Kjør en spesifisert kommando for hver fil i en gruppe med filer.\n\n\ +FOR %variabel IN (gruppe) DO kommando [parametere]\n\ +FOR /L %variabel IN (start,step,end) DO kommando [parametere]\n\ +FOR /D %variabel IN (gruppe) DO kommando [parametere]\n\ +FOR /R [[drive:]path] IN (gruppe) DO kommando [parametere]\n\ +FOR /F [""options""] IN (gruppe) DO kommando [parametere]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %variabel Angir en erstattelig parameter.\n\ (sett) Angir en gruppe med en eller flere filer. Jokertegn kan bli brukt.\n\ kommando Angir kommandoen som skal brukes for hver enkelt fil.\n\ - parametere Angir parameterne eller bryterne for angitte kommando.\n\n\ + parametere Angir parameterne eller bryterne for angitte kommando.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ For å bruke FOR kommando i en satsvis fil, spesifisere %%variabel isteden for\n\ %variabel.\n" STRING_FREE_HELP1 "\nVolum i stasjon %s er %-11s\n\ diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index 5bb15f3e45..5adf2e068b 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -219,12 +219,25 @@ Wpisz ECHO bez żadnych parametrów, by wyświetlić obecne ustawienie." /B Zamyka jedynie plik wsadowy. \n\ Jeśli użyty będzie poza plikiem wsadowym, zamknie cmd.exe\n\ kod Ta wartość zostanie przypisana do ERRORLEVEL przy wyjściu.\n" - STRING_FOR_HELP1 "Uruchamia wyznaczoną komendę dla każdego pliku w zestawie\n\n\ -FOR %zmienna IN (zestaw) DO komenda [parametery]\n\n\ - %zmienna Wyznacza zamienny parametr.\n\ - (zestaw) Definiuje zestaw plików. Można stosować wieloznaczniki (np. *.*)\n\ - komenda Wyznacza komendę do wykonania na zestawie plików.\n\ - parametry Wyznacza parametry dla podanej komendy.\n\n\ + STRING_FOR_HELP1 "Uruchamia wyznaczoną komendę dla każdego pliku w zestawie.\n\n\ +FOR %zmienna IN (zestaw) DO komenda [parametery]\n\ +FOR /L %zmienna IN (start,step,end) DO komenda [parametery]\n\ +FOR /D %zmienna IN (zestaw) DO komenda [parametery]\n\ +FOR /R [[drive:]path] IN (zestaw) DO komenda [parametery]\n\ +FOR /F [""options""] IN (zestaw) DO komenda [parametery]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %zmienna Wyznacza zamienny parametr.\n\ + (zestaw) Definiuje zestaw plików. Można stosować wieloznaczniki (np. *.*)\n\ + komenda Wyznacza komendę do wykonania na zestawie plików.\n\ + parametry Wyznacza parametry dla podanej komendy.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ By użyć FOR w pliku wsadowym, oznacz zmienną jako %%zmienna zamiast\n\ %zmienna.\n" STRING_FREE_HELP1 "\nWolumin w napędzie %s ma etykietę: %-11s\n\ diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 2f5c5e6adf..4e86924670 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -235,14 +235,27 @@ Tastați ECHO fără argumente pentru afișarea stării curente a ecoului.\n" cod_de_ieșire Valoare atribuită variabilei ERRORLEVEL la ieșirea din\n\ interpretorul de comenzi.\n" STRING_FOR_HELP1 "Execută o comandă pentru fiecare fișier dintr-un grup.\n\n\ -FOR %%variablă IN (grup) DO comandă [argumente]\n\n\ - %%variablă Specifică un argument înlocuitor.\n\ +FOR %variablă IN (grup) DO comandă [argumente]\n\ +FOR /L %variablă IN (start,step,end) DO comandă [argumente]\n\ +FOR /D %variablă IN (grup) DO comandă [argumente]\n\ +FOR /R [[drive:]path] IN (grup) DO comandă [argumente]\n\ +FOR /F [""options""] IN (grup) DO comandă [argumente]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %variablă Specifică un argument înlocuitor.\n\ (grup) Specifică un grup de unul sau mai multe fișiere.\n\ Sunt permise metacaractere.\n\ comandă Specifică o comandă executată pentru fiecare fișier.\n\ - argumente Indică argumente pentru comanda executată.\n\n\ -Pentru utilizarea comenzii FOR într-un fișier de comenzi,\n\ -specificați %%%%variabilă în loc de %%variabilă.\n" + argumente Indică argumente pentru comanda executată.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +Pentru utilizarea comenzii FOR într-un fișier de comenzi, specificați\n\ +%%variabilă în loc de %variabilă.\n" STRING_FREE_HELP1 "\nVolumul unității %s este etichetat ca %-11s\n\ Numărul de serie este %s\n\ %16s octeți pe disc în total\n\ diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 63d45f9dde..54f3d4ed07 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -212,13 +212,26 @@ ECHO без параметра выводит текущий режим отоб /B Завершает текущий пакетный файл. \n\ Если выполняется вне пакетного файла, то будет завершена программа CMD.EXE\n\ ExitCode Это значение будет присвоено ERRORLEVEL после выхода\n" - STRING_FOR_HELP1 "Запускает указанную команду для каждого файла из набора файлов\n\n\ -FOR %переменная IN (набор) DO команда [параметры]\n\n\ + STRING_FOR_HELP1 "Запускает указанную команду для каждого файла из набора файлов.\n\n\ +FOR %переменная IN (набор) DO команда [параметры]\n\ +FOR /L %переменная IN (start,step,end) DO команда [параметры]\n\ +FOR /D %переменная IN (набор) DO команда [параметры]\n\ +FOR /R [[drive:]path] IN (набор) DO команда [параметры]\n\ +FOR /F [""options""] IN (набор) DO команда [параметры]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %переменная Подставляемый параметр.\n\ (набор) Набор из одного или нескольких файлов.\n\ Допускается использование подстановочных знаков.\n\ команда Команда, которую следует выполнить для каждого файла.\n\ - параметры Параметры и ключи для указанной команды.\n\n\ + параметры Параметры и ключи для указанной команды.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ В пакетных файлах для команды FOR используется запись\n\ %%переменная вместо %переменная.\n" STRING_FREE_HELP1 "\nТом диска %s: %-11s\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index e705969ba8..e2a301ae9b 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -217,12 +217,25 @@ Type ECHO without a parameter to display the current ECHO setting." /B Exits a batch file only. \n\ If run outside of a batch file it will exit cmd.exe\n\ ExitCode This value will be assigned to ERRORLEVEL on exit\n" - STRING_FOR_HELP1 "Runs a specified command for each file in a set of files\n\n\ -FOR %variable IN (set) DO command [parameters]\n\n\ + STRING_FOR_HELP1 "Runs a specified command for each file in a set of files.\n\n\ +FOR %variable IN (set) DO command [parameters]\n\ +FOR /L %variable IN (start,step,end) DO command [parameters]\n\ +FOR /D %variable IN (set) DO command [parameters]\n\ +FOR /R [[drive:]path] IN (set) DO command [parameters]\n\ +FOR /F [""options""] IN (set) DO command [parameters]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Specifies a replaceable parameter.\n\ (set) Specifies a set of one or more files. Wildcards may be used.\n\ command Specifies the command to carry out for each file.\n\ - parameters Specifies parameters or switches for the specified command.\n\n\ + parameters Specifies parameters or switches for the specified command.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ To use the FOR command in a batch program, specify %%variable instead of\n\ %variable.\n" STRING_FREE_HELP1 "\nVolume in drive %s is %-11s\n\ diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 05f78a1b0b..91845f7ece 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -215,14 +215,27 @@ Shkruaj ECHO pa parametra qe shfaqin konfigurimin aktual te ECHO." /B Dalje nga batch vetëm. \n\ Nëse drejtuar jashtë nga një skedar batch do të dalë nga cmd.exe\n\ ExitCode Kjo vlerë do të caktohet për ERRORLEVEL në dalje\n" - STRING_FOR_HELP1 "Ekzekuto një komandë të specifikuar për secilën dokument në një grupim dokumentesh\n\n\ -FOR %variable IN (set) DO command [parameters]\n\n\ + STRING_FOR_HELP1 "Ekzekuto një komandë të specifikuar për secilën dokument në një grupim dokumentesh.\n\n\ +FOR %variable IN (set) DO command [parameters]\n\ +FOR /L %variable IN (start,step,end) DO command [parameters]\n\ +FOR /D %variable IN (set) DO command [parameters]\n\ +FOR /R [[drive:]path] IN (set) DO command [parameters]\n\ +FOR /F [""options""] IN (set) DO command [parameters]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ %variable Specifikon një parametër zëvndësueshme.\n\ (set) Përcakton një grup të një ose më shumë dosjeve. Jokeri mund të përdoret.\n\ command Përcakton komandën për ta rrealizuar për çdo skedar.\n\ - parameters Përcakton parametrat apo çelsin për komandën e specifikuar.\n\n\ -Për të përdorur komanden FOR në një program batch, specifiko %%variablet në vënd të\n\ -%variable.\n" + parameters Përcakton parametrat apo çelsin për komandën e specifikuar.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +Për të përdorur komanden FOR në një program batch, specifiko %%variablet në vënd\n\ +të %variable.\n" STRING_FREE_HELP1 "\nVolume në drive %s is %-11s\n\ Nummeri Serial është %s\n\ %16s bytes total në disk\n\ diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index 4eee829b65..613f18f33b 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -211,13 +211,26 @@ Skriv ECHO utan parametar för att visa aktuell ECHO inställning." /B Avslutt bara en batchfil. \n\ Om det körs utan en batch filkommer det avslutta cmd.exe\n\ ExitCode Detta värdet kommer att skickas till ERRORLEVEL vid avslutning\n" - STRING_FOR_HELP1 "Kör ett angivet kommando för varje fil i en grupp med filer\n\n\ -FOR %variabel IN (grupp) DO kommando [parametrar]\n\n\ - %variable Anger en utbytbar parameter (en enda bokstav).\n\ + STRING_FOR_HELP1 "Kör ett angivet kommando för varje fil i en grupp med filer.\n\n\ +FOR %variabel IN (grupp) DO kommando [parametrar]\n\ +FOR /L %variabel IN (start,step,end) DO kommando [parametrar]\n\ +FOR /D %variabel IN (grupp) DO kommando [parametrar]\n\ +FOR /R [[drive:]path] IN (grupp) DO kommando [parametrar]\n\ +FOR /F [""options""] IN (grupp) DO kommando [parametrar]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %variabel Anger en utbytbar parameter (en enda bokstav).\n\ (grupp) Anger en grupp med en eller flera filer. Jokertecken kan användas.\n\ kommando Anger kommandot som skall användas för varje enskild fil.\n\ - parametrar Anger parametrarna eller växlarna för angivet kommando.\n\n\ -för att bruke FOR kommando i en batchfil, ange %%variabel istället för\n\ + parametrar Anger parametrarna eller växlarna för angivet kommando.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +För att bruke FOR kommando i en batchfil, ange %%variabel istället för\n\ %variabel.\n" STRING_FREE_HELP1 "\nVolum i enhet %s är %-11s\n\ Serienummret är %s\n\ diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index b2cf89458f..982af49de0 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -218,12 +218,25 @@ PUSHD [yol | ..]\n\n\ Bir toplu iş kütüğünün dışında çalışırsa cmd.exe'den çıkacaktır.\n\ çıkış kodu Bu değer çıkışta ERRORLEVEL'e atanacaktır.\n" STRING_FOR_HELP1 "Bir takım kütükte tüm kütükler için belirtilen bir komut çalıştırır.\n\n\ -FOR %%değişken IN (takım) DO komut [değişkenler]\n\n\ - %%değişken Yerine geçebilir bir değişken belirtir.\n\ - (takım) Bir ya da daha çok kütük takımını belirtir. Umûmî arama damgaları kullanılabilir.\n\ +FOR %değişken IN (takım) DO komut [değişkenler]\n\ +FOR /L %değişken IN (start,step,end) DO komut [değişkenler]\n\ +FOR /D %değişken IN (takım) DO komut [değişkenler]\n\ +FOR /R [[drive:]path] IN (takım) DO komut [değişkenler]\n\ +FOR /F [""options""] IN (takım) DO komut [değişkenler]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %değişken Yerine geçebilir bir değişken belirtir.\n\ + (takım) Bir ya da daha çok kütük takımını belirtir. Umûmî arama damgaları\n\ + kullanılabilir.\n\ komut Tüm kütükler için yürütülecek komutu belirtir.\n\ değişkenler Belirtilen komut için değişkenleri ya da seçenekleri belirtir.\n\n\ -FOR komutunu bir toplu iş kütüğünde kullanmak için %%değişken yerine %%%%değişken\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +FOR komutunu bir toplu iş kütüğünde kullanmak için %değişken yerine %%değişken\n\ belirtiniz.\n" STRING_FREE_HELP1 "\n%s sürücüsünde birim %-11s\n\ Dizilik numarası %s\n\ diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 063d0c44ac..d30ef0163e 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -222,14 +222,27 @@ ECHO без параметра виводить поточний режим вi /B Виходить лише з пакетного файлу. \n\ Якщо робота йде поза пакетним файлом - вихiд з cmd.exe\n\ ExitCode Це значення буде присвоєно ERRORLEVEL при виходi\n" - STRING_FOR_HELP1 "Запускає вказану команду для кожного файлу з набору файлiв\n\n\ -FOR %variable IN (набiр) DO команда [параметри]\n\n\ - %variable Параметр, що пiдставляється.\n\ + STRING_FOR_HELP1 "Запускає вказану команду для кожного файлу з набору файлiв.\n\n\ +FOR %параметр IN (набiр) DO команда [параметри]\n\ +FOR /L %параметр IN (start,step,end) DO команда [параметри]\n\ +FOR /D %параметр IN (набiр) DO команда [параметри]\n\ +FOR /R [[drive:]path] IN (набiр) DO команда [параметри]\n\ +FOR /F [""options""] IN (набiр) DO команда [параметри]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %параметр Параметр, що пiдставляється.\n\ (набiр) Набiр з одного або декiлькох файлiв. Можна використовувати маски.\n\ команда Команда, яку слiд виконати для кожного файлу.\n\ - параметри Параметри i ключi для вказаної команди.\n\n\ -В пакетних програмах для команди FOR використовується %%variable замiсть\n\ -%variable.\n" + параметри Параметри i ключi для вказаної команди.\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ +В пакетних програмах для команди FOR використовується %%параметр замiсть\n\ +%параметр.\n" STRING_FREE_HELP1 "\nТом диску %s : %-11s\n\ Серiйний номер: %s\n\ %16s байт загального дискового простору\n\ diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index bce3965b93..00543e1b7b 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -202,11 +202,24 @@ PUSHD [路径 | ..]\n\n\ 如果在一个批处理文件之外运行，将会使 cmd.exe 退出。\n\ 退出代码这个值将会在退出时赋给 ERRORLEVEL。\n" STRING_FOR_HELP1 "在一组文件中为每个文件运行指定的命令。\n\n\ -FOR %变量 IN (集合) DO 命令 [参数]\n\n\ - %变量指定一个可被替换的参数。\n\ - (集合) 指定一个含有一个或多个文件的集合。可以使用通配符。\n\ - 命令指定要为每个文件执行的命令。\n\ - 参数为指定的命令指定参数或开关。\n\n\ +FOR %变量 IN (集合) DO 命令 [参数]\n\ +FOR /L %变量 IN (start,step,end) DO 命令 [参数]\n\ +FOR /D %变量 IN (集合) DO 命令 [参数]\n\ +FOR /R [[drive:]path] IN (集合) DO 命令 [参数]\n\ +FOR /F [""options""] IN (集合) DO 命令 [参数]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %变量指定一个可被替换的参数。\n\ + (集合) 指定一个含有一个或多个文件的集合。可以使用通配符。\n\ + 命令指定要为每个文件执行的命令。\n\ + 参数为指定的命令指定参数或开关。\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ 在批处理文件中使用 FOR 命令时，使用 %%变量而不是 %变量。\n" STRING_FREE_HELP1 "\n驱动器 %s 中的卷是 %-11s\n\ 序列号为 %s\n\ diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 3a108bf599..1366af2cd1 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -202,11 +202,24 @@ PUSHD [路徑 | ..]\n\n\ 如果在一個批處理檔案之外運行，將會使 cmd.exe 退出。\n\ 退出程式碼這個值將會在退出時賦給 ERRORLEVEL。\n" STRING_FOR_HELP1 "在一組檔案中為每個檔案運行指定的命令。\n\n\ -FOR %變數 IN (集合) DO 命令 [參數]\n\n\ - %變數指定一個可被替換的參數。\n\ - (集合) 指定一個含有一個或多個檔案的集合。可以使用通配符。\n\ - 命令指定要為每個檔案執行的命令。\n\ - 參數為指定的命令指定參數或開關。\n\n\ +FOR %變數 IN (集合) DO 命令 [參數]\n\ +FOR /L %變數 IN (start,step,end) DO 命令 [參數]\n\ +FOR /D %變數 IN (集合) DO 命令 [參數]\n\ +FOR /R [[drive:]path] IN (集合) DO 命令 [參數]\n\ +FOR /F [""options""] IN (集合) DO 命令 [參數]\n\n\ + /L Generates a number sequence from start to end incrementing by step.\n\ + /D Modifies the set to refer to directories instead of files.\n\ + /R Executes command for files in the set in the specified path (or current\n\ + working directory if not specified) and every directory below.\n\ + /F Modifies the set to refer to the contents of the files in the set.\n\n\ + %變數指定一個可被替換的參數。\n\ + (集合) 指定一個含有一個或多個檔案的集合。可以使用通配符。\n\ + 命令指定要為每個檔案執行的命令。\n\ + 參數為指定的命令指定參數或開關。\n\ + options Supported options are: eol, skip, delims, tokens, and usebackq.\n\n\ +Replacable parameters can be modified by adding a ~ and an optional qualifier\n\ +after the % and before the name (e.g. %~X). Supported qualifiers are:\n\ +f,d,p,n,x,s,a,t,z.\n\n\ 在批處理檔案中使用 FOR 命令時，使用 %%變數而不是 %變數。\n" STRING_FREE_HELP1 "\n驅動器 %s 中的卷是 %-11s\n\ 序列號為 %s\n\

1 0

[reactos] 01/01: [PCIIDEX] Properly handle unknown PNP IRPs. CORE-13944
by Thomas Faber 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed95fa19f079465eccc5a… commit ed95fa19f079465eccc5a055cad017eac6438d94 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Nov 12 14:31:20 2017 +0100 [PCIIDEX] Properly handle unknown PNP IRPs. CORE-13944 --- drivers/storage/ide/pciidex/pdo.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/storage/ide/pciidex/pdo.c b/drivers/storage/ide/pciidex/pdo.c index af41e5f5f7..c82d9d7fea 100644 --- a/drivers/storage/ide/pciidex/pdo.c +++ b/drivers/storage/ide/pciidex/pdo.c @@ -428,8 +428,7 @@ PciIdeXPdoPnpDispatch( { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); - ASSERT(FALSE); - Status = STATUS_NOT_SUPPORTED; + Status = Irp->IoStatus.Status; break; } } @@ -526,7 +525,6 @@ PciIdeXPdoPnpDispatch( /* We can't forward request to the lower driver, because * we are a Pdo, so we don't have lower driver... */ DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", MinorFunction); - ASSERT(FALSE); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; }

1 0

[reactos] 01/01: [FASTFAT] More FS statistics
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8503842309018f02eb43c… commit 8503842309018f02eb43c714d6d385f7bb75d0da Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 22:18:11 2017 +0100 [FASTFAT] More FS statistics --- drivers/filesystems/fastfat/rw.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 0ac467d87d..c945ee6044 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -673,6 +673,9 @@ VfatRead( Status = /*STATUS_END_OF_FILE*/STATUS_SUCCESS; } + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileReadBytes, Length); + _SEH2_TRY { if (IrpContext->FileObject->PrivateCacheMap == NULL) @@ -722,8 +725,16 @@ VfatRead( Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + if (!IsVolume) + { + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + } + else + { + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataReadBytes, Length); + } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); if (NT_SUCCESS(Status)) @@ -954,6 +965,9 @@ VfatWrite( { // cached write + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.UserFileWriteBytes, Length); + _SEH2_TRY { if (IrpContext->FileObject->PrivateCacheMap == NULL) @@ -1006,8 +1020,16 @@ VfatWrite( CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); } - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWrites, 1); - vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWriteBytes, Length); + if (!IsVolume) + { + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWriteBytes, Length); + } + else + { + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Base.MetaDataWriteBytes, Length); + } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); if (NT_SUCCESS(Status))

1 0

[reactos] 01/01: [SHELL32] Update French translation
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63dcfd2de3e3b8d75fd11… commit 63dcfd2de3e3b8d75fd111fb41b9b18cb7523c7c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 18:24:08 2017 +0100 [SHELL32] Update French translation --- dll/win32/shell32/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 325487e4fe..a16d160512 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -807,7 +807,7 @@ BEGIN IDS_ANY_FILE "%s-file" IDS_OPEN_VERB "Ouvrir" - IDS_EXPLORE_VERB "Explore" + IDS_EXPLORE_VERB "Explorer" IDS_RUNAS_VERB "Exécuter en tant que..." IDS_EDIT_VERB "Éditer" IDS_FIND_VERB "Chercher"

1 0

[reactos] 01/01: [FLTMGR] Latest from my branch (#135)
by Ged Murphy 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfb776380d4ca289a30b9… commit dfb776380d4ca289a30b999791040d80bd38e0ae Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Tue Nov 21 16:36:29 2017 +0000 [FLTMGR] Latest from my branch (#135) [FLTMGR][KMTEST] Squash and push my local branch across to master as the patch is getting a bit large. This is still WIP and none of this code is run in ros yet, so don't fret if you see ugly/unfinished code or int3's dotted around. [FLTMGR] Improve loading/reg of filters and start to implement client connections - Implement handling of connections from clients - Implement closing of client ports - Add a basic message waiter queue using CSQ's (untested) - Hand off messages for the comms object to be handled by the comms file - Initialize the connection list - Add a registry file which will contain lib functions for accessing filter service entries - [KMTEST] Initial usermode support for testing FS mini-filters - Add base routines to wrap the win32 'Filter' APis - Add support routines to be used when testing FS filter drivers - Move KmtCreateService to a private routine so it can be shared with KmtFltCreateService - Completely untested at the mo, so likely contains bugs at this point - Add support for adding altitude and flags registry entries for minifilters - Allow minifilters to setup without requiring instance attach/detach callbacks - Add tests for FltRegisterFilter and FltUnregisterFilter and start to add associated tests --- drivers/filters/fltmgr/CMakeLists.txt | 1 + drivers/filters/fltmgr/Filter.c | 223 +++++++++- drivers/filters/fltmgr/Interface.c | 22 +- drivers/filters/fltmgr/Messaging.c | 462 ++++++++++++++++++++- drivers/filters/fltmgr/Misc.c | 2 +- drivers/filters/fltmgr/Registry.c | 142 +++++++ drivers/filters/fltmgr/Registry.h | 20 + drivers/filters/fltmgr/fltmgr.h | 7 +- drivers/filters/fltmgr/fltmgrint.h | 180 +++++--- modules/rostests/kmtests/CMakeLists.txt | 4 + modules/rostests/kmtests/fltmgr/CMakeLists.txt | 1 + .../kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 12 +- .../kmtests/fltmgr/fltmgr_load/fltmgr_load.c | 2 +- .../kmtests/fltmgr/fltmgr_load/fltmgr_user.c | 28 ++ .../kmtests/fltmgr/fltmgr_register/CMakeLists.txt | 15 + .../fltmgr/fltmgr_register/fltmgr_reg_user.c | 23 + .../fltmgr/fltmgr_register/fltmgr_register.c | 248 +++++++++++ modules/rostests/kmtests/include/kmt_platform.h | 1 + modules/rostests/kmtests/include/kmt_test.h | 17 +- modules/rostests/kmtests/kmtest/filter.c | 88 +--- modules/rostests/kmtests/kmtest/fltsupport.c | 335 +++++++++++++-- modules/rostests/kmtests/kmtest/kmtest.h | 11 +- modules/rostests/kmtests/kmtest/testlist.c | 4 + .../kmtests/kmtest_drv/kmtest_fsminifilter.c | 121 ++++-- 24 files changed, 1739 insertions(+), 230 deletions(-) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index 5a02cab116..cb6ebbdd18 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE Messaging.c Misc.c Object.c + Registry.c Volume.c ${CMAKE_CURRENT_BINARY_DIR}/fltmgr.def fltmgr.h) diff --git a/drivers/filters/fltmgr/Filter.c b/drivers/filters/fltmgr/Filter.c index 71e45aea04..92a824c0d3 100644 --- a/drivers/filters/fltmgr/Filter.c +++ b/drivers/filters/fltmgr/Filter.c @@ -10,6 +10,7 @@ #include "fltmgr.h" #include "fltmgrint.h" +#include "Registry.h" #define NDEBUG #include <debug.h> @@ -25,6 +26,17 @@ FltpStartingToDrainObject( _Inout_ PFLT_OBJECT Object ); +VOID +FltpMiniFilterDriverUnload( +); + +static +NTSTATUS +GetFilterAltitude( + _In_ PFLT_FILTER Filter, + _Inout_ PUNICODE_STRING AltitudeString +); + /* EXPORTED FUNCTIONS ******************************************************/ @@ -56,8 +68,26 @@ NTSTATUS NTAPI FltUnloadFilter(_In_ PCUNICODE_STRING FilterName) { - UNREFERENCED_PARAMETER(FilterName); - return STATUS_NOT_IMPLEMENTED; + // + //FIXME: This is a temp hack, it needs properly implementing + // + + UNICODE_STRING DriverServiceName; + UNICODE_STRING ServicesKey; + CHAR Buffer[MAX_KEY_LENGTH]; + + /* Setup the base services key */ + RtlInitUnicodeString(&ServicesKey, SERVICES_KEY); + + /* Initialize the string data */ + DriverServiceName.Length = 0; + DriverServiceName.Buffer = (PWCH)Buffer; + DriverServiceName.MaximumLength = MAX_KEY_LENGTH; + + /* Create the full service key for this filter */ + RtlCopyUnicodeString(&DriverServiceName, &ServicesKey); + RtlAppendUnicodeStringToString(&DriverServiceName, FilterName); + return ZwUnloadDriver(&DriverServiceName); } NTSTATUS @@ -74,6 +104,8 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, PCHAR Ptr; NTSTATUS Status; + *RetFilter = NULL; + /* Make sure we're targeting the correct major revision */ if ((Registration->Version & 0xFF00) != FLT_MAJOR_VERSION) { @@ -145,6 +177,10 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, InitializeListHead(&Filter->ActiveOpens.mList); Filter->ActiveOpens.mCount = 0; + ExInitializeFastMutex(&Filter->ConnectionList.mLock); + InitializeListHead(&Filter->ConnectionList.mList); + Filter->ConnectionList.mCount = 0; + /* Initialize the usermode port list */ ExInitializeFastMutex(&Filter->PortList.mLock); InitializeListHead(&Filter->PortList.mList); @@ -199,15 +235,42 @@ FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, Filter->Name.Buffer = (PWCH)Ptr; RtlCopyUnicodeString(&Filter->Name, &DriverObject->DriverExtension->ServiceKeyName); + Status = GetFilterAltitude(Filter, &Filter->DefaultAltitude); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + // - // - Get the altitude string // - Slot the filter into the correct altitude location // - More stuff?? // + /* Store any existing driver unload routine before we make any changes */ + Filter->OldDriverUnload = (PFLT_FILTER_UNLOAD_CALLBACK)DriverObject->DriverUnload; + + /* Check we opted not to have an unload routine, or if we want to stop the driver from being unloaded */ + if (!FlagOn(Filter->Flags, FLTFL_REGISTRATION_DO_NOT_SUPPORT_SERVICE_STOP)) + { + DriverObject->DriverUnload = (PDRIVER_UNLOAD)FltpMiniFilterDriverUnload; + } + else + { + DriverObject->DriverUnload = (PDRIVER_UNLOAD)NULL; + } + + Quit: - if (!NT_SUCCESS(Status)) + + if (NT_SUCCESS(Status)) + { + DPRINT1("Loaded FS mini-filter %wZ\n", &DriverObject->DriverExtension->ServiceKeyName); + *RetFilter = Filter; + } + else { + DPRINT1("Failed to load FS mini-filter %wZ : 0x%X\n", &DriverObject->DriverExtension->ServiceKeyName, Status); + // Add cleanup for context resources ExDeleteResourceLite(&Filter->InstanceList.rLock); @@ -319,3 +382,155 @@ FltpStartingToDrainObject(_Inout_ PFLT_OBJECT Object) return STATUS_SUCCESS; } + +VOID +FltpMiniFilterDriverUnload() +{ + __debugbreak(); +} + +/* PRIVATE FUNCTIONS ******************************************************/ + +static +NTSTATUS +GetFilterAltitude( + _In_ PFLT_FILTER Filter, + _Inout_ PUNICODE_STRING AltitudeString) +{ + UNICODE_STRING InstancesKey = RTL_CONSTANT_STRING(L"Instances"); + UNICODE_STRING DefaultInstance = RTL_CONSTANT_STRING(L"DefaultInstance"); + UNICODE_STRING Altitude = RTL_CONSTANT_STRING(L"Altitude"); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING FilterInstancePath; + ULONG BytesRequired; + HANDLE InstHandle = NULL; + HANDLE RootHandle; + PWCH InstBuffer = NULL; + PWCH AltBuffer = NULL; + NTSTATUS Status; + + /* Get a handle to the instances key in the filter's services key */ + Status = FltpOpenFilterServicesKey(Filter, + KEY_QUERY_VALUE, + &InstancesKey, + &RootHandle); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Read the size 'default instances' string value */ + Status = FltpReadRegistryValue(RootHandle, + &DefaultInstance, + REG_SZ, + NULL, + 0, + &BytesRequired); + + /* We should get a buffer too small error */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate the buffer we need to hold the string */ + InstBuffer = ExAllocatePoolWithTag(PagedPool, BytesRequired, FM_TAG_UNICODE_STRING); + if (InstBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now read the string value */ + Status = FltpReadRegistryValue(RootHandle, + &DefaultInstance, + REG_SZ, + InstBuffer, + BytesRequired, + &BytesRequired); + } + + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Convert the string to a unicode_string */ + RtlInitUnicodeString(&FilterInstancePath, InstBuffer); + + /* Setup the attributes using the root key handle */ + InitializeObjectAttributes(&ObjectAttributes, + &FilterInstancePath, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + RootHandle, + NULL); + + /* Now open the key name which was stored in the default instance */ + Status = ZwOpenKey(&InstHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Get the size of the buffer that holds the altitude */ + Status = FltpReadRegistryValue(InstHandle, + &Altitude, + REG_SZ, + NULL, + 0, + &BytesRequired); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate the required buffer */ + AltBuffer = ExAllocatePoolWithTag(PagedPool, BytesRequired, FM_TAG_UNICODE_STRING); + if (AltBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* And now finally read in the actual altitude string */ + Status = FltpReadRegistryValue(InstHandle, + &Altitude, + REG_SZ, + AltBuffer, + BytesRequired, + &BytesRequired); + if (NT_SUCCESS(Status)) + { + /* We made it, setup the return buffer */ + AltitudeString->Length = BytesRequired; + AltitudeString->MaximumLength = BytesRequired; + AltitudeString->Buffer = AltBuffer; + } + } + } + +Quit: + if (!NT_SUCCESS(Status)) + { + if (AltBuffer) + { + ExFreePoolWithTag(AltBuffer, FM_TAG_UNICODE_STRING); + } + } + + if (InstBuffer) + { + ExFreePoolWithTag(InstBuffer, FM_TAG_UNICODE_STRING); + } + + if (InstHandle) + { + ZwClose(InstHandle); + } + ZwClose(RootHandle); + + return Status; +} + + + +NTSTATUS +FltpReadRegistryValue( + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired +); \ No newline at end of file diff --git a/drivers/filters/fltmgr/Interface.c b/drivers/filters/fltmgr/Interface.c index be1288a7c2..158303be92 100644 --- a/drivers/filters/fltmgr/Interface.c +++ b/drivers/filters/fltmgr/Interface.c @@ -28,6 +28,8 @@ ((_devObj)->DriverObject == Dispatcher::DriverObject) && \ ((_devObj)->DeviceExtension != NULL)) +extern PDEVICE_OBJECT CommsDeviceObject; + DRIVER_INITIALIZE DriverEntry; NTSTATUS @@ -454,6 +456,13 @@ FltpDispatch(_In_ PDEVICE_OBJECT DeviceObject, return Status; } + /* Check if this is a request for a the messaging device */ + if (DeviceObject == CommsDeviceObject) + { + /* Hand off to our internal routine */ + return FltpMsgDispatch(DeviceObject, Irp); + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); @@ -494,6 +503,13 @@ FltpCreate(_In_ PDEVICE_OBJECT DeviceObject, return STATUS_SUCCESS; } + /* Check if this is a request for a the new comms connection */ + if (DeviceObject == CommsDeviceObject) + { + /* Hand off to our internal routine */ + return FltpMsgCreate(DeviceObject, Irp); + } + FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); @@ -2104,9 +2120,9 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject, Status = SetupDispatchAndCallbacksTables(DriverObject); if (!NT_SUCCESS(Status)) goto Cleanup; - // - // TODO: Create fltmgr message device - // + /* Initialize the comms objects */ + Status = FltpSetupCommunicationObjects(DriverObject); + if (!NT_SUCCESS(Status)) goto Cleanup; /* Register for notifications when a new file system is loaded. This also enumerates any existing file systems */ Status = IoRegisterFsRegistrationChange(DriverObject, FltpFsNotification); diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index 97e6a94c9c..6a40e0d8c1 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -10,6 +10,7 @@ #include "fltmgr.h" #include "fltmgrint.h" +#include <fltmgr_shared.h> #define NDEBUG #include <debug.h> @@ -29,6 +30,32 @@ FltpDisconnectPort( _In_ PFLT_PORT_OBJECT PortObject ); +static +NTSTATUS +CreateClientPort( + _In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp +); + +static +NTSTATUS +CloseClientPort( + _In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp +); + +static +NTSTATUS +InitializeMessageWaiterQueue( + _Inout_ PFLT_MESSAGE_WAITER_QUEUE MsgWaiterQueue +); + +static +PPORT_CCB +CreatePortCCB( + _In_ PFLT_PORT_OBJECT PortObject +); + /* EXPORTED FUNCTIONS ******************************************************/ @@ -72,8 +99,8 @@ FltCreateCommunicationPort(_In_ PFLT_FILTER Filter, return Status; } - /* Create our new server port object */ - Status = ObCreateObject(0, + /* Create the server port object for this filter */ + Status = ObCreateObject(KernelMode, ServerPortObjectType, ObjectAttributes, KernelMode, @@ -191,6 +218,72 @@ FltSendMessage(_In_ PFLT_FILTER Filter, /* INTERNAL FUNCTIONS ******************************************************/ + +NTSTATUS +FltpMsgCreate(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + /* Get the stack location */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + + FLT_ASSERT(StackPtr->MajorFunction == IRP_MJ_CREATE); + + /* Check if this is a caller wanting to connect */ + if (StackPtr->MajorFunction == IRP_MJ_CREATE) + { + /* Create the client port for this connection and exit */ + Status = CreateClientPort(StackPtr->FileObject, Irp); + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + + return Status; +} + +NTSTATUS +FltpMsgDispatch(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + /* Get the stack location */ + StackPtr = IoGetCurrentIrpStackLocation(Irp); + + /* Check if this is a caller wanting to connect */ + if (StackPtr->MajorFunction == IRP_MJ_CLOSE) + { + /* Create the client port for this connection and exit */ + Status = CloseClientPort(StackPtr->FileObject, Irp); + } + else + { + // We don't support anything else yet + Status = STATUS_NOT_IMPLEMENTED; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, 0); + } + + return Status; +} + VOID NTAPI FltpServerPortClose(_In_opt_ PEPROCESS Process, @@ -369,5 +462,370 @@ Quit: return Status; } +/* CSQ IRP CALLBACKS *******************************************************/ + + +NTSTATUS +NTAPI +FltpAddMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp, + _In_ PVOID InsertContext) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Insert the IRP at the end of the queue */ + InsertTailList(&MessageWaiterQueue->WaiterQ.mList, + &Irp->Tail.Overlay.ListEntry); + + /* return success */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +FltpRemoveMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp) +{ + /* Remove the IRP from the queue */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); +} + +PIRP +NTAPI +FltpGetNextMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp, + _In_ PVOID PeekContext) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + PIRP NextIrp = NULL; + PLIST_ENTRY NextEntry; + PIO_STACK_LOCATION IrpStack; + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Is the IRP valid? */ + if (Irp == NULL) + { + /* Start peeking from the listhead */ + NextEntry = MessageWaiterQueue->WaiterQ.mList.Flink; + } + else + { + /* Start peeking from that IRP onwards */ + NextEntry = Irp->Tail.Overlay.ListEntry.Flink; + } + + /* Loop through the queue */ + while (NextEntry != &MessageWaiterQueue->WaiterQ.mList) + { + /* Store the next IRP in the list */ + NextIrp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + + /* Did we supply a PeekContext on insert? */ + if (!PeekContext) + { + /* We already have the next IRP */ + break; + } + else + { + /* Get the stack of the next IRP */ + IrpStack = IoGetCurrentIrpStackLocation(NextIrp); + + /* Does the PeekContext match the object? */ + if (IrpStack->FileObject == (PFILE_OBJECT)PeekContext) + { + /* We have a match */ + break; + } + + /* Move to the next IRP */ + NextIrp = NULL; + NextEntry = NextEntry->Flink; + } + } + + return NextIrp; +} + +_Acquires_lock_(((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, FLT_MESSAGE_WAITER_QUEUE, Csq))->WaiterQ.mLock) +_IRQL_saves_global_(Irql, ((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_raises_(DISPATCH_LEVEL) +VOID +NTAPI +FltpAcquireMessageWaiterLock(_In_ PIO_CSQ Csq, + _Out_ PKIRQL Irql) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + UNREFERENCED_PARAMETER(Irql); + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Acquire the IRP queue lock */ + ExAcquireFastMutex(&MessageWaiterQueue->WaiterQ.mLock); +} + +_Releases_lock_(((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_restores_global_(Irql, ((PFLT_MESSAGE_WAITER_QUEUE)CONTAINING_RECORD(Csq, DEVICE_EXTENSION, IrpQueue))->WaiterQ.mLock) +_IRQL_requires_(DISPATCH_LEVEL) +VOID +NTAPI +FltpReleaseMessageWaiterLock(_In_ PIO_CSQ Csq, + _In_ KIRQL Irql) +{ + PFLT_MESSAGE_WAITER_QUEUE MessageWaiterQueue; + + UNREFERENCED_PARAMETER(Irql); + + /* Get the start of the waiter queue struct */ + MessageWaiterQueue = CONTAINING_RECORD(Csq, + FLT_MESSAGE_WAITER_QUEUE, + Csq); + + /* Release the IRP queue lock */ + ExReleaseFastMutex(&MessageWaiterQueue->WaiterQ.mLock); +} + +VOID +NTAPI +FltpCancelMessageWaiter(_In_ PIO_CSQ Csq, + _In_ PIRP Irp) +{ + /* Cancel the IRP */ + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + + /* PRIVATE FUNCTIONS ******************************************************/ +static +NTSTATUS +CreateClientPort(_In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp) +{ + PFLT_SERVER_PORT_OBJECT ServerPortObject = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILTER_PORT_DATA FilterPortData; + PFLT_PORT_OBJECT ClientPortObject = NULL; + PFLT_PORT PortHandle = NULL; + PPORT_CCB PortCCB = NULL; + //ULONG BufferLength; + LONG NumConns; + NTSTATUS Status; + + /* We received the buffer via FilterConnectCommunicationPort, cast it back to its original form */ + FilterPortData = Irp->AssociatedIrp.SystemBuffer; + + /* Get a reference to the server port the filter created */ + Status = ObReferenceObjectByName(&FilterPortData->PortName, + 0, + 0, + FLT_PORT_ALL_ACCESS, + ServerPortObjectType, + ExGetPreviousMode(), + 0, + (PVOID *)&ServerPortObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Increment the number of connections on the server port */ + NumConns = InterlockedIncrement(&ServerPortObject->NumberOfConnections); + if (NumConns > ServerPortObject->MaxConnections) + { + Status = STATUS_CONNECTION_COUNT_LIMIT; + goto Quit; + } + + /* Initialize a basic kernel handle request */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Now create the new client port object */ + Status = ObCreateObject(KernelMode, + ClientPortObjectType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(FLT_PORT_OBJECT), + 0, + 0, + (PVOID *)&ClientPortObject); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Clear out the buffer */ + RtlZeroMemory(ClientPortObject, sizeof(FLT_PORT_OBJECT)); + + /* Initialize the locks */ + ExInitializeRundownProtection(&ClientPortObject->MsgNotifRundownRef); + ExInitializeFastMutex(&ClientPortObject->Lock); + + /* Set the server port object this belongs to */ + ClientPortObject->ServerPort = ServerPortObject; + + /* Setup the message queue */ + Status = InitializeMessageWaiterQueue(&ClientPortObject->MsgQ); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Create the CCB which we'll attach to the file object */ + PortCCB = CreatePortCCB(ClientPortObject); + if (PortCCB == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now insert the new client port into the object manager*/ + Status = ObInsertObject(ClientPortObject, 0, FLT_PORT_ALL_ACCESS, 1, 0, (PHANDLE)&PortHandle); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Add a reference to the filter to keep it alive while we do some work with it */ + Status = FltObjectReference(ServerPortObject->Filter); + if (NT_SUCCESS(Status)) + { + /* Invoke the callback to let the filter know we have a connection */ + Status = ServerPortObject->ConnectNotify(PortHandle, + ServerPortObject->Cookie, + NULL, //ConnectionContext + 0, //SizeOfContext + &ClientPortObject->Cookie); + if (NT_SUCCESS(Status)) + { + /* Add the client port CCB to the file object */ + FileObject->FsContext2 = PortCCB; + + /* Lock the port list on the filter and add this new port object to the list */ + ExAcquireFastMutex(&ServerPortObject->Filter->PortList.mLock); + InsertTailList(&ServerPortObject->Filter->PortList.mList, &ClientPortObject->FilterLink); + ExReleaseFastMutex(&ServerPortObject->Filter->PortList.mLock); + } + + /* We're done with the filter object, decremement the count */ + FltObjectDereference(ServerPortObject->Filter); + } + + +Quit: + if (!NT_SUCCESS(Status)) + { + if (ClientPortObject) + { + ObfDereferenceObject(ClientPortObject); + } + + if (PortHandle) + { + ZwClose(PortHandle); + } + else if (ServerPortObject) + { + InterlockedDecrement(&ServerPortObject->NumberOfConnections); + ObfDereferenceObject(ServerPortObject); + } + + if (PortCCB) + { + ExFreePoolWithTag(PortCCB, FM_TAG_CCB); + } + } + + return Status; +} + +static +NTSTATUS +CloseClientPort(_In_ PFILE_OBJECT FileObject, + _Inout_ PIRP Irp) +{ + PFLT_CCB Ccb; + + Ccb = (PFLT_CCB)FileObject->FsContext2; + + /* Remove the reference on the filter we added when we opened the port */ + ObDereferenceObject(Ccb->Data.Port.Port); + + // FIXME: Free the CCB + + return STATUS_SUCCESS; +} + +static +NTSTATUS +InitializeMessageWaiterQueue(_Inout_ PFLT_MESSAGE_WAITER_QUEUE MsgWaiterQueue) +{ + NTSTATUS Status; + + /* Setup the IRP queue */ + Status = IoCsqInitializeEx(&MsgWaiterQueue->Csq, + FltpAddMessageWaiter, + FltpRemoveMessageWaiter, + FltpGetNextMessageWaiter, + FltpAcquireMessageWaiterLock, + FltpReleaseMessageWaiterLock, + FltpCancelMessageWaiter); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Initialize the waiter queue */ + ExInitializeFastMutex(&MsgWaiterQueue->WaiterQ.mLock); + InitializeListHead(&MsgWaiterQueue->WaiterQ.mList); + MsgWaiterQueue->WaiterQ.mCount = 0; + + /* We don't have a minimum waiter length */ + MsgWaiterQueue->MinimumWaiterLength = (ULONG)-1; + + /* Init the semaphore and event used for counting and signaling available IRPs */ + KeInitializeSemaphore(&MsgWaiterQueue->Semaphore, 0, MAXLONG); + KeInitializeEvent(&MsgWaiterQueue->Event, NotificationEvent, FALSE); + + return STATUS_SUCCESS; +} + +static +PPORT_CCB +CreatePortCCB(_In_ PFLT_PORT_OBJECT PortObject) +{ + PPORT_CCB PortCCB; + + /* Allocate a CCB struct to hold the client port object info */ + PortCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(PPORT_CCB), FM_TAG_CCB); + if (PortCCB) + { + /* Initialize the structure */ + PortCCB->Port = PortObject; + PortCCB->ReplyWaiterList.mCount = 0; + ExInitializeFastMutex(&PortCCB->ReplyWaiterList.mLock); + KeInitializeEvent(&PortCCB->ReplyWaiterList.mLock.Event, SynchronizationEvent, 0); + } + + return PortCCB; +} \ No newline at end of file diff --git a/drivers/filters/fltmgr/Misc.c b/drivers/filters/fltmgr/Misc.c index 3ef1424d5f..8643c48882 100644 --- a/drivers/filters/fltmgr/Misc.c +++ b/drivers/filters/fltmgr/Misc.c @@ -29,8 +29,8 @@ FltBuildDefaultSecurityDescriptor( _In_ ACCESS_MASK DesiredAccess ) { - UNREFERENCED_PARAMETER(SecurityDescriptor); UNREFERENCED_PARAMETER(DesiredAccess); + *SecurityDescriptor = NULL; return 0; } diff --git a/drivers/filters/fltmgr/Registry.c b/drivers/filters/fltmgr/Registry.c new file mode 100644 index 0000000000..2470d70442 --- /dev/null +++ b/drivers/filters/fltmgr/Registry.c @@ -0,0 +1,142 @@ +/* + * PROJECT: Filesystem Filter Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/filters/fltmgr/Misc.c + * PURPOSE: Uncataloged functions + * PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" +#include "fltmgrint.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + +#define REG_SERVICES_KEY L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" +#define REG_PATH_LENGTH 512 + + +/* INTERNAL FUNCTIONS ******************************************************/ + + +NTSTATUS +FltpOpenFilterServicesKey( + _In_ PFLT_FILTER Filter, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ PUNICODE_STRING SubKey, + _Out_ PHANDLE Handle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ServicesKey; + UNICODE_STRING Path; + WCHAR Buffer[REG_PATH_LENGTH]; + + /* Setup a local buffer to hold the services key path */ + Path.Length = 0; + Path.MaximumLength = REG_PATH_LENGTH; + Path.Buffer = Buffer; + + /* Build up the serices key name */ + RtlInitUnicodeString(&ServicesKey, REG_SERVICES_KEY); + RtlCopyUnicodeString(&Path, &ServicesKey); + RtlAppendUnicodeStringToString(&Path, &Filter->Name); + + if (SubKey) + { + /* Tag on any child key */ + RtlAppendUnicodeToString(&Path, L"\\"); + RtlAppendUnicodeStringToString(&Path, SubKey); + } + + InitializeObjectAttributes(&ObjectAttributes, + &Path, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open and return the key handle param*/ + return ZwOpenKey(Handle, DesiredAccess, &ObjectAttributes); +} + +NTSTATUS +FltpReadRegistryValue(_In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired) +{ + PKEY_VALUE_PARTIAL_INFORMATION Value = NULL; + ULONG ValueLength = 0; + NTSTATUS Status; + + PAGED_CODE(); + + /* Get the size of the buffer required to hold the string */ + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + NULL, + 0, + &ValueLength); + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + { + return Status; + } + + /* Allocate the buffer */ + Value = (PKEY_VALUE_PARTIAL_INFORMATION)ExAllocatePoolWithTag(PagedPool, + ValueLength, + FM_TAG_TEMP_REGISTRY); + if (Value == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quit; + } + + /* Now read in the value */ + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + Value, + ValueLength, + &ValueLength); + if (!NT_SUCCESS(Status)) + { + goto Quit; + } + + /* Make sure we got the type expected */ + if (Value->Type != Type) + { + Status = STATUS_INVALID_PARAMETER; + goto Quit; + } + + if (BytesRequired) + { + *BytesRequired = Value->DataLength; + } + + /* Make sure the caller buffer is big enough to hold the data */ + if (!BufferSize || BufferSize < Value->DataLength) + { + Status = STATUS_BUFFER_TOO_SMALL; + goto Quit; + } + + /* Copy the data into the caller buffer */ + RtlCopyMemory(Buffer, Value->Data, Value->DataLength); + +Quit: + + if (Value) + ExFreePoolWithTag(Value, FM_TAG_TEMP_REGISTRY); + + return Status; +} diff --git a/drivers/filters/fltmgr/Registry.h b/drivers/filters/fltmgr/Registry.h new file mode 100644 index 0000000000..b295daefac --- /dev/null +++ b/drivers/filters/fltmgr/Registry.h @@ -0,0 +1,20 @@ +#pragma once + + +NTSTATUS +FltpOpenFilterServicesKey( + _In_ PFLT_FILTER Filter, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ PUNICODE_STRING SubKey, + _Out_ PHANDLE Handle +); + +NTSTATUS +FltpReadRegistryValue( + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING ValueName, + _In_opt_ ULONG Type, + _Out_writes_bytes_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG BytesRequired +); \ No newline at end of file diff --git a/drivers/filters/fltmgr/fltmgr.h b/drivers/filters/fltmgr/fltmgr.h index 71e070b5f3..7008c1d094 100644 --- a/drivers/filters/fltmgr/fltmgr.h +++ b/drivers/filters/fltmgr/fltmgr.h @@ -18,6 +18,8 @@ #define FM_TAG_UNICODE_STRING 'suMF' #define FM_TAG_FILTER 'lfMF' #define FM_TAG_CONTEXT_REGISTA 'rcMF' +#define FM_TAG_CCB 'bcMF' +#define FM_TAG_TEMP_REGISTRY 'rtMF' #define MAX_DEVNAME_LENGTH 64 @@ -100,6 +102,9 @@ FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, VOID FltpFreeUnicodeString(_In_ PUNICODE_STRING String); + + + //////////////////////////////////////////////// @@ -252,7 +257,7 @@ FltGetUpperInstance FltGetVolumeContext FltGetVolumeFromDeviceObject FltGetVolumeFromFileObject -FltGetVolumeFromInstance +FltLoadFilter FltGetVolumeFromName FltGetVolumeGuidName FltGetVolumeInstanceFromName diff --git a/drivers/filters/fltmgr/fltmgrint.h b/drivers/filters/fltmgr/fltmgrint.h index a060b70eec..64065be763 100644 --- a/drivers/filters/fltmgr/fltmgrint.h +++ b/drivers/filters/fltmgr/fltmgrint.h @@ -58,10 +58,45 @@ typedef struct _FLT_MUTEX_LIST_HEAD } FLT_MUTEX_LIST_HEAD, *PFLT_MUTEX_LIST_HEAD; +typedef struct _FLT_TYPE +{ + USHORT Signature; + USHORT Size; + +} FLT_TYPE, *PFLT_TYPE; + +// http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-1.html +typedef struct _FLTP_FRAME +{ + FLT_TYPE Type; + LIST_ENTRY Links; + unsigned int FrameID; + ERESOURCE AltitudeLock; + UNICODE_STRING AltitudeIntervalLow; + UNICODE_STRING AltitudeIntervalHigh; + char LargeIrpCtrlStackSize; + char SmallIrpCtrlStackSize; + FLT_RESOURCE_LIST_HEAD RegisteredFilters; + FLT_RESOURCE_LIST_HEAD AttachedVolumes; + LIST_ENTRY MountingVolumes; + FLT_MUTEX_LIST_HEAD AttachedFileSystems; + FLT_MUTEX_LIST_HEAD ZombiedFltObjectContexts; + ERESOURCE FilterUnloadLock; + FAST_MUTEX DeviceObjectAttachLock; + //FLT_PRCB *Prcb; + void *PrcbPoolToFree; + void *LookasidePoolToFree; + //FLTP_IRPCTRL_STACK_PROFILER IrpCtrlStackProfiler; + NPAGED_LOOKASIDE_LIST SmallIrpCtrlLookasideList; + NPAGED_LOOKASIDE_LIST LargeIrpCtrlLookasideList; + //STATIC_IRP_CONTROL GlobalSIC; + +} FLTP_FRAME, *PFLTP_FRAME; + typedef struct _FLT_FILTER // size = 0x120 { FLT_OBJECT Base; - PVOID Frame; //FLTP_FRAME + PFLTP_FRAME Frame; UNICODE_STRING Name; UNICODE_STRING DefaultAltitude; FLT_FILTER_FLAGS Flags; @@ -97,12 +132,7 @@ typedef enum _FLT_yINSTANCE_FLAGS } FLT_INSTANCE_FLAGS, *PFLT_INSTANCE_FLAGS; -typedef struct _FLT_TYPE -{ - USHORT Signature; - USHORT Size; -} FLT_TYPE, *PFLT_TYPE; typedef struct _FLT_INSTANCE // size = 0x144 (324) { @@ -121,34 +151,18 @@ typedef struct _FLT_INSTANCE // size = 0x144 (324) } FLT_INSTANCE, *PFLT_INSTANCE; -// http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-1.html -typedef struct _FLTP_FRAME + +typedef struct _TREE_ROOT { - FLT_TYPE Type; - LIST_ENTRY Links; - unsigned int FrameID; - ERESOURCE AltitudeLock; - UNICODE_STRING AltitudeIntervalLow; - UNICODE_STRING AltitudeIntervalHigh; - char LargeIrpCtrlStackSize; - char SmallIrpCtrlStackSize; - FLT_RESOURCE_LIST_HEAD RegisteredFilters; - FLT_RESOURCE_LIST_HEAD AttachedVolumes; - LIST_ENTRY MountingVolumes; - FLT_MUTEX_LIST_HEAD AttachedFileSystems; - FLT_MUTEX_LIST_HEAD ZombiedFltObjectContexts; - ERESOURCE FilterUnloadLock; - FAST_MUTEX DeviceObjectAttachLock; - //FLT_PRCB *Prcb; - void *PrcbPoolToFree; - void *LookasidePoolToFree; - //FLTP_IRPCTRL_STACK_PROFILER IrpCtrlStackProfiler; - NPAGED_LOOKASIDE_LIST SmallIrpCtrlLookasideList; - NPAGED_LOOKASIDE_LIST LargeIrpCtrlLookasideList; - //STATIC_IRP_CONTROL GlobalSIC; + RTL_SPLAY_LINKS *Tree; -} FLTP_FRAME, *PFLTP_FRAME; +} TREE_ROOT, *PTREE_ROOT; + +typedef struct _CONTEXT_LIST_CTRL +{ + TREE_ROOT List; +} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; // http://fsfilters.blogspot.co.uk/2010/02/filter-manager-concepts-part-6.html typedef struct _STREAM_LIST_CTRL // size = 0xC8 (200) @@ -156,16 +170,16 @@ typedef struct _STREAM_LIST_CTRL // size = 0xC8 (200) FLT_TYPE Type; FSRTL_PER_STREAM_CONTEXT ContextCtrl; LIST_ENTRY VolumeLink; - //STREAM_LIST_CTRL_FLAGS Flags; + ULONG Flags; //STREAM_LIST_CTRL_FLAGS Flags; int UseCount; ERESOURCE ContextLock; - //CONTEXT_LIST_CTRL StreamContexts; - //CONTEXT_LIST_CTRL StreamHandleContexts; + CONTEXT_LIST_CTRL StreamContexts; + CONTEXT_LIST_CTRL StreamHandleContexts; ERESOURCE NameCacheLock; LARGE_INTEGER LastRenameCompleted; - //NAME_CACHE_LIST_CTRL NormalizedNameCache; - // NAME_CACHE_LIST_CTRL ShortNameCache; - // NAME_CACHE_LIST_CTRL OpenedNameCache; + ULONG NormalizedNameCache; //NAME_CACHE_LIST_CTRL NormalizedNameCache; + ULONG ShortNameCache; // NAME_CACHE_LIST_CTRL ShortNameCache; + ULONG OpenedNameCache; // NAME_CACHE_LIST_CTRL OpenedNameCache; int AllNameContextsTemporary; } STREAM_LIST_CTRL, *PSTREAM_LIST_CTRL; @@ -186,6 +200,17 @@ typedef struct _FLT_SERVER_PORT_OBJECT } FLT_SERVER_PORT_OBJECT, *PFLT_SERVER_PORT_OBJECT; +typedef struct _FLT_MESSAGE_WAITER_QUEUE +{ + IO_CSQ Csq; + FLT_MUTEX_LIST_HEAD WaiterQ; + ULONG MinimumWaiterLength; + KSEMAPHORE Semaphore; + KEVENT Event; + +} FLT_MESSAGE_WAITER_QUEUE, *PFLT_MESSAGE_WAITER_QUEUE; + + typedef struct _FLT_PORT_OBJECT { LIST_ENTRY FilterLink; @@ -193,7 +218,7 @@ typedef struct _FLT_PORT_OBJECT PVOID Cookie; EX_RUNDOWN_REF MsgNotifRundownRef; FAST_MUTEX Lock; - PVOID MsgQ; // FLT_MESSAGE_WAITER_QUEUE MsgQ; + FLT_MESSAGE_WAITER_QUEUE MsgQ; ULONGLONG MessageId; KEVENT DisconnectEvent; BOOLEAN Disconnected; @@ -232,18 +257,6 @@ typedef struct _CALLBACK_CTRL } CALLBACK_CTRL, *PCALLBACK_CTRL; -typedef struct _TREE_ROOT -{ - RTL_SPLAY_LINKS *Tree; - -} TREE_ROOT, *PTREE_ROOT; - - -typedef struct _CONTEXT_LIST_CTRL -{ - TREE_ROOT List; - -} CONTEXT_LIST_CTRL, *PCONTEXT_LIST_CTRL; typedef struct _NAME_CACHE_LIST_CTRL_STATS { @@ -311,6 +324,58 @@ typedef struct _FLT_VOLUME } FLT_VOLUME, *PFLT_VOLUME; +typedef struct _MANAGER_CCB +{ + PFLTP_FRAME Frame; + unsigned int Iterator; + +} MANAGER_CCB, *PMANAGER_CCB; + +typedef struct _FILTER_CCB +{ + PFLT_FILTER Filter; + unsigned int Iterator; + +} FILTER_CCB, *PFILTER_CCB; + +typedef struct _INSTANCE_CCB +{ + PFLT_INSTANCE Instance; + +} INSTANCE_CCB, *PINSTANCE_CCB; + +typedef struct _VOLUME_CCB +{ + UNICODE_STRING Volume; + unsigned int Iterator; + +} VOLUME_CCB, *PVOLUME_CCB; + +typedef struct _PORT_CCB +{ + PFLT_PORT_OBJECT Port; + FLT_MUTEX_LIST_HEAD ReplyWaiterList; + +} PORT_CCB, *PPORT_CCB; + + +typedef union _CCB_TYPE +{ + MANAGER_CCB Manager; + FILTER_CCB Filter; + INSTANCE_CCB Instance; + VOLUME_CCB Volume; + PORT_CCB Port; + +} CCB_TYPE, *PCCB_TYPE; + + +typedef struct _FLT_CCB +{ + FLT_TYPE Type; + CCB_TYPE Data; + +} FLT_CCB, *PFLT_CCB; VOID FltpExInitializeRundownProtection( @@ -387,6 +452,21 @@ FltpDispatchHandler( _Inout_ PIRP Irp ); +NTSTATUS +FltpMsgCreate( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); +NTSTATUS +FltpMsgDispatch( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp +); + +NTSTATUS +FltpSetupCommunicationObjects( + _In_ PDRIVER_OBJECT DriverObject +); #endif /* _FLTMGR_INTERNAL_H */ diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 64b088d221..c66ed9a38e 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -127,6 +127,10 @@ list(APPEND KMTEST_SOURCE kmtest/testlist.c example/Example_user.c + + fltmgr/fltmgr_load/fltmgr_user.c + fltmgr/fltmgr_register/fltmgr_reg_user.c + hidparse/HidP_user.c kernel32/FileAttributes_user.c kernel32/FindFile_user.c diff --git a/modules/rostests/kmtests/fltmgr/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/CMakeLists.txt index fd7a55e6bc..f0fdac80bc 100644 --- a/modules/rostests/kmtests/fltmgr/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(fltmgr_load) add_subdirectory(fltmgr_create) +add_subdirectory(fltmgr_register) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt index 7fa022d154..f93e516be8 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt @@ -5,10 +5,10 @@ list(APPEND FLTMGR_TEST_DRV_SOURCE ../../kmtest_drv/kmtest_fsminifilter.c fltmgr_load.c) -add_library(fltmgr_load SHARED ${FLTMGR_TEST_DRV_SOURCE}) -set_module_type(fltmgr_load kernelmodedriver) -target_link_libraries(fltmgr_load kmtest_printf ${PSEH_LIB}) -add_importlibs(fltmgr_load fltmgr ntoskrnl hal) -add_target_compile_definitions(fltmgr_load KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +add_library(FltMgrLoad_drv SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(FltMgrLoad_drv kernelmodedriver) +target_link_libraries(FltMgrLoad_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(FltMgrLoad_drv fltmgr ntoskrnl hal) +add_target_compile_definitions(FltMgrLoad_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(example_drv ../include/kmt_test.h) -add_rostests_file(TARGET fltmgr_load) +add_rostests_file(TARGET FltMgrLoad_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c index 7b9f5235cb..e56d7eb62a 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_load.c @@ -89,7 +89,7 @@ TestEntry( ok_irql(PASSIVE_LEVEL); TestDriverObject = DriverObject; - *DeviceName = L"fltmgr_load"; + *DeviceName = L"FltMgrLoad"; trace("Hi, this is the filter manager load test driver\n"); diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c new file mode 100644 index 0000000000..727e9c0703 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/fltmgr_user.c @@ -0,0 +1,28 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filters load and connect correctly + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> + + +START_TEST(FltMgrLoad) +{ + static WCHAR FilterName[] = L"FltMgrLoad"; + SC_HANDLE hService; + HANDLE hPort; + + trace("Message from user-mode\n"); + + ok(KmtFltCreateService(FilterName, L"FltMgrLoad test driver", &hService) == ERROR_SUCCESS, "\n"); + ok(KmtFltLoadDriver(FALSE, FALSE, FALSE, &hPort) == ERROR_PRIVILEGE_NOT_HELD, "\n"); + ok(KmtFltLoadDriver(TRUE, FALSE, FALSE, &hPort) == ERROR_SUCCESS, "\n"); + + ok(KmtFltConnectComms(&hPort) == ERROR_SUCCESS, "\n"); + + ok(KmtFltDisconnectComms(hPort) == ERROR_SUCCESS, "\n"); + ok(KmtFltUnloadDriver(hPort, FALSE) == ERROR_SUCCESS, "\n"); + KmtFltDeleteService(NULL, &hService); +} diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt new file mode 100644 index 0000000000..2857a32bd6 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt @@ -0,0 +1,15 @@ + +include_directories(../../include) +include_directories(${REACTOS_SOURCE_DIR}/drivers/filters/fltmgr) + +list(APPEND FLTMGR_TEST_DRV_SOURCE + ../../kmtest_drv/kmtest_fsminifilter.c + fltmgr_register.c) + +add_library(fltmgrreg_drv SHARED ${FLTMGR_TEST_DRV_SOURCE}) +set_module_type(fltmgrreg_drv kernelmodedriver) +target_link_libraries(fltmgrreg_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(fltmgrreg_drv fltmgr ntoskrnl hal) +add_target_compile_definitions(fltmgrreg_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +#add_pch(example_drv ../include/kmt_test.h) +add_rostests_file(TARGET fltmgrreg_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c new file mode 100644 index 0000000000..da7d072988 --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_reg_user.c @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filter registration + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +#include <kmt_test.h> + + +START_TEST(FltMgrReg) +{ + static WCHAR FilterName[] = L"FltMgrReg"; + SC_HANDLE hService; + HANDLE hPort; + + ok(KmtFltCreateService(FilterName, L"FltMgrLoad test driver", &hService) == ERROR_SUCCESS, "Failed to create the reg entry\n"); + ok(KmtFltAddAltitude(L"123456") == ERROR_SUCCESS, "\n"); + ok(KmtFltLoadDriver(TRUE, FALSE, FALSE, &hPort) == ERROR_SUCCESS, "Failed to load the driver\n"); + //__debugbreak(); + ok(KmtFltUnloadDriver(hPort, FALSE) == ERROR_SUCCESS, "Failed to unload the driver\n"); + ok(KmtFltDeleteService(NULL, &hService) == ERROR_SUCCESS, "Failed to delete the driver\n"); +} diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c new file mode 100644 index 0000000000..9703dfa8fd --- /dev/null +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/fltmgr_register.c @@ -0,0 +1,248 @@ +/* + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for checking filter registration + * PROGRAMMER: Ged Murphy <gedmurphy(a)reactos.org> + */ + +// This tests needs to be run via a standalone driver because FltRegisterFilter +// uses the DriverObject in its internal structures, and we don't want it to be +// linked to a device object from the test suite itself. + +#include <kmt_test.h> +#include <fltkernel.h> +#include <fltmgrint.h> + +//#define NDEBUG +#include <debug.h> + +#define RESET_REGISTRATION(basic) \ + do { \ + RtlZeroMemory(&FilterRegistration, sizeof(FLT_REGISTRATION)); \ + if (basic) { \ + FilterRegistration.Size = sizeof(FLT_REGISTRATION); \ + FilterRegistration.Version = FLT_REGISTRATION_VERSION; \ + } \ + } while (0) + +#define RESET_UNLOAD(DO) DO->DriverUnload = NULL; + + +NTSTATUS +FLTAPI +TestRegFilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags +); + +/* Globals */ +static PDRIVER_OBJECT TestDriverObject; +static FLT_REGISTRATION FilterRegistration; +static PFLT_FILTER TestFilter = NULL; + + + + +BOOLEAN +TestFltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject) +{ + UNICODE_STRING Altitude; + UNICODE_STRING Name; + PFLT_FILTER Filter = NULL; + PFLT_FILTER Temp = NULL; + NTSTATUS Status; + + RESET_REGISTRATION(FALSE); +#if 0 + KmtStartSeh() + Status = FltRegisterFilter(NULL, &FilterRegistration, &Filter); + KmtEndSeh(STATUS_INVALID_PARAMETER); + + KmtStartSeh() + Status = FltRegisterFilter(DriverObject, NULL, &Filter); + KmtEndSeh(STATUS_INVALID_PARAMETER); + + KmtStartSeh() + Status = FltRegisterFilter(DriverObject, &FilterRegistration, NULL); + KmtEndSeh(STATUS_INVALID_PARAMETER) +#endif + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0100; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0300; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Version = 0x0200; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + + /* Test invalid sizes. MSDN says this is required, but it doesn't appear to be */ + RESET_REGISTRATION(TRUE); + FilterRegistration.Size = 0; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + RESET_REGISTRATION(TRUE); + FilterRegistration.Size = 0xFFFF; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + FltUnregisterFilter(Filter); + + + /* Now make a valid registration */ + RESET_REGISTRATION(TRUE); + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Filter); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Try to register again */ + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &Temp); + ok_eq_hex(Status, STATUS_FLT_INSTANCE_ALTITUDE_COLLISION); + + + ok_eq_hex(Filter->Base.Flags, FLT_OBFL_TYPE_FILTER); + + /* Check we have the right filter name */ + RtlInitUnicodeString(&Name, L"Kmtest-FltMgrReg"); + ok_eq_long(RtlCompareUnicodeString(&Filter->Name, &Name, FALSE), 0); + + /* And the altitude is corect */ + RtlInitUnicodeString(&Altitude, L"123456"); + ok_eq_long(RtlCompareUnicodeString(&Filter->DefaultAltitude, &Altitude, FALSE), 0); + + // + // FIXME: More checks + // + + /* Cleanup the valid registration */ + FltUnregisterFilter(Filter); + + /* + * The last thing we'll do before we exit is to properly register with the filter manager + * and set an unload routine. This'll let us test the FltUnregisterFilter routine + */ + RESET_REGISTRATION(TRUE); + + /* Set a fake unload routine we'll use to test */ + DriverObject->DriverUnload = (PDRIVER_UNLOAD)0x1234FFFF; + + FilterRegistration.FilterUnloadCallback = TestRegFilterUnload; + Status = FltRegisterFilter(DriverObject, &FilterRegistration, &TestFilter); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* Test all the unlod routines */ + ok_eq_pointer(TestFilter->FilterUnload, TestRegFilterUnload); + ok_eq_pointer(TestFilter->OldDriverUnload, (PFLT_FILTER_UNLOAD_CALLBACK)0x1234FFFF); + + // This should equal the fltmgr's private unload routine, but there's no easy way of testing it... + //ok_eq_pointer(DriverObject->DriverUnload, FltpMiniFilterDriverUnload); + + /* Make sure our test address is never actually called */ + TestFilter->OldDriverUnload = (PFLT_FILTER_UNLOAD_CALLBACK)NULL; + + return TRUE; +} + + +NTSTATUS +FLTAPI +TestRegFilterUnload( + _In_ FLT_FILTER_UNLOAD_FLAGS Flags) +{ + //__debugbreak(); + + ok_irql(PASSIVE_LEVEL); + ok(TestFilter != NULL, "Buffer is NULL\n"); + + // + // FIXME: Add tests + // + + FltUnregisterFilter(TestFilter); + + // + // FIXME: Add tests + // + + return STATUS_SUCCESS; +} + + + + + + + + + + +/* + * KMT Callback routines + */ + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + IN OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT("FltMgrReg Entry!\n"); + trace("Entered FltMgrReg tests\n"); + + /* We'll do the work ourselves in this test */ + *Flags = TESTENTRY_NO_ALL; + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + + /* Run the tests */ + (VOID)TestFltRegisterFilter(DriverObject); + + return Status; +} + +VOID +TestFilterUnload( + IN ULONG Flags) +{ + PAGED_CODE(); + ok_irql(PASSIVE_LEVEL); +} + +NTSTATUS +TestInstanceSetup( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_SETUP_FLAGS Flags, + _In_ DEVICE_TYPE VolumeDeviceType, + _In_ FLT_FILESYSTEM_TYPE VolumeFilesystemType, + _In_ PUNICODE_STRING VolumeName, + _In_ ULONG SectorSize, + _In_ ULONG ReportedSectorSize +) +{ + return STATUS_FLT_DO_NOT_ATTACH; +} + +VOID +TestQueryTeardown( + _In_ PCFLT_RELATED_OBJECTS FltObjects, + _In_ FLT_INSTANCE_QUERY_TEARDOWN_FLAGS Flags) +{ + UNREFERENCED_PARAMETER(FltObjects); + UNREFERENCED_PARAMETER(Flags); +} diff --git a/modules/rostests/kmtests/include/kmt_platform.h b/modules/rostests/kmtests/include/kmt_platform.h index 636f099cf6..3e29d2c9af 100644 --- a/modules/rostests/kmtests/include/kmt_platform.h +++ b/modules/rostests/kmtests/include/kmt_platform.h @@ -44,6 +44,7 @@ #include <strsafe.h> #include <fltuser.h> + #ifdef KMT_EMULATE_KERNEL #define ok_irql(i) #define KIRQL int diff --git a/modules/rostests/kmtests/include/kmt_test.h b/modules/rostests/kmtests/include/kmt_test.h index 8fcc93a419..1c5ddeefa2 100644 --- a/modules/rostests/kmtests/include/kmt_test.h +++ b/modules/rostests/kmtests/include/kmt_test.h @@ -126,9 +126,12 @@ NTSTATUS KmtFilterRegisterCallbacks(_In_ CONST FLT_OPERATION_REGISTRATION *Opera typedef enum { - TESTENTRY_NO_REGISTER_FILTER = 1, - TESTENTRY_NO_CREATE_COMMS_PORT = 2, - TESTENTRY_NO_START_FILTERING = 4, + TESTENTRY_NO_REGISTER_FILTER = 0x01, + TESTENTRY_NO_CREATE_COMMS_PORT = 0x02, + TESTENTRY_NO_START_FILTERING = 0x04, + TESTENTRY_NO_INSTANCE_SETUP = 0x08, + TESTENTRY_NO_QUERY_TEARDOWN = 0x10, + TESTENTRY_NO_ALL = 0xFF } KMT_MINIFILTER_FLAGS; VOID TestFilterUnload(_In_ ULONG Flags); @@ -174,8 +177,14 @@ DWORD KmtSendWStringToDriver(IN DWORD ControlCode, IN PCWSTR String); DWORD KmtSendUlongToDriver(IN DWORD ControlCode, IN DWORD Value); DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); -DWORD KmtFltLoadDriver(_In_z_ PCWSTR ServiceName, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); + +DWORD KmtFltCreateService(_In_z_ PCWSTR ServiceName, _In_z_ PCWSTR DisplayName, _Out_ SC_HANDLE *ServiceHandle); +DWORD KmtFltDeleteService(_In_opt_z_ PCWSTR ServiceName, _Inout_ SC_HANDLE *ServiceHandle); +DWORD KmtFltAddAltitude(_In_z_ LPWSTR Altitude); +DWORD KmtFltLoadDriver(_In_ BOOLEAN EnableDriverLoadPrivlege, _In_ BOOLEAN RestartIfRunning, _In_ BOOLEAN ConnectComms, _Out_ HANDLE *hPort); DWORD KmtFltUnloadDriver(_In_ HANDLE *hPort, _In_ BOOLEAN DisonnectComms); +DWORD KmtFltConnectComms(_Out_ HANDLE *hPort); +DWORD KmtFltDisconnectComms(_In_ HANDLE hPort); DWORD KmtFltRunKernelTest(_In_ HANDLE hPort, _In_z_ PCSTR TestName); DWORD KmtFltSendToDriver(_In_ HANDLE hPort, _In_ DWORD Message); DWORD KmtFltSendStringToDriver(_In_ HANDLE hPort, _In_ DWORD Message, _In_ PCSTR String); diff --git a/modules/rostests/kmtests/kmtest/filter.c b/modules/rostests/kmtests/kmtest/filter.c index cb5957477c..042d1743b2 100644 --- a/modules/rostests/kmtests/kmtest/filter.c +++ b/modules/rostests/kmtests/kmtest/filter.c @@ -14,50 +14,8 @@ #define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) -/* - * We need to call the internal function in the service.c file - */ -DWORD -KmtpCreateService( - IN PCWSTR ServiceName, - IN PCWSTR ServicePath, - IN PCWSTR DisplayName OPTIONAL, - IN DWORD ServiceType, - OUT SC_HANDLE *ServiceHandle); - -static SC_HANDLE ScmHandle; -/** - * @name KmtFltCreateService - * - * Create the specified driver service and return a handle to it - * - * @param ServiceName - * Name of the service to create - * @param ServicePath - * File name of the driver, relative to the current directory - * @param DisplayName - * Service display name - * @param ServiceHandle - * Pointer to a variable to receive the handle to the service - * - * @return Win32 error code - */ -DWORD -KmtFltCreateService( - _In_z_ PCWSTR ServiceName, - _In_z_ PCWSTR ServicePath, - _In_z_ PCWSTR DisplayName OPTIONAL, - _Out_ SC_HANDLE *ServiceHandle) -{ - return KmtpCreateService(ServiceName, - ServicePath, - DisplayName, - SERVICE_FILE_SYSTEM_DRIVER, - ServiceHandle); -} - /** * @name KmtFltLoad * @@ -82,7 +40,7 @@ KmtFltLoad( return Error; } - +#if 0 /** * @name KmtFltCreateAndStartService * @@ -143,7 +101,7 @@ cleanup: assert(Error); return Error; } - +#endif /** * @name KmtFltConnect @@ -163,7 +121,7 @@ KmtFltConnect( _Out_ HANDLE *hPort) { HRESULT hResult; - DWORD Error = ERROR_SUCCESS; + DWORD Error; assert(ServiceName); assert(hPort); @@ -191,7 +149,7 @@ KmtFltConnect( */ DWORD KmtFltDisconnect( - _Out_ HANDLE *hPort) + _In_ HANDLE hPort) { DWORD Error = ERROR_SUCCESS; @@ -388,41 +346,3 @@ KmtFltUnload( return Error; } - -/** - * @name KmtFltDeleteService - * - * Delete the specified filter driver - * - * @param ServiceName - * If *ServiceHandle is NULL, name of the service to delete - * @param ServiceHandle - * Pointer to a variable containing the service handle. - * Will be set to NULL on success - * - * @return Win32 error code - */ -DWORD -KmtFltDeleteService( - _In_z_ PCWSTR ServiceName OPTIONAL, - _Inout_ SC_HANDLE *ServiceHandle) -{ - return KmtDeleteService(ServiceName, ServiceHandle); -} - -/** - * @name KmtFltCloseService - * - * Close the specified driver service handle - * - * @param ServiceHandle - * Pointer to a variable containing the service handle. - * Will be set to NULL on success - * - * @return Win32 error code - */ -DWORD KmtFltCloseService( - _Inout_ SC_HANDLE *ServiceHandle) -{ - return KmtCloseService(ServiceHandle); -} diff --git a/modules/rostests/kmtests/kmtest/fltsupport.c b/modules/rostests/kmtests/kmtest/fltsupport.c index 772e98a211..4127ccad24 100644 --- a/modules/rostests/kmtests/kmtest/fltsupport.c +++ b/modules/rostests/kmtests/kmtest/fltsupport.c @@ -7,12 +7,28 @@ #include <kmt_test.h> +#define KMT_FLT_USER_MODE #include "kmtest.h" #include <kmt_public.h> #include <assert.h> #include <debug.h> +/* + * We need to call the internal function in the service.c file + */ +DWORD +KmtpCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + IN DWORD ServiceType, + OUT SC_HANDLE *ServiceHandle); + +DWORD EnablePrivilegeInCurrentProcess( + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable); + // move to a shared location typedef struct _KMTFLT_MESSAGE_HEADER { @@ -26,33 +42,30 @@ extern HANDLE KmtestHandle; static WCHAR TestServiceName[MAX_PATH]; + /** - * @name KmtFltLoadDriver + * @name KmtFltCreateService * - * Load the specified filter driver - * This routine will create the service entry if it doesn't already exist + * Create the specified driver service and return a handle to it * * @param ServiceName - * Name of the driver service (Kmtest- prefix will be added automatically) - * @param RestartIfRunning - * TRUE to stop and restart the service if it is already running - * @param ConnectComms - * TRUE to create a comms connection to the specified filter - * @param hPort - * Handle to the filter's comms port + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service * * @return Win32 error code */ DWORD -KmtFltLoadDriver( +KmtFltCreateService( _In_z_ PCWSTR ServiceName, - _In_ BOOLEAN RestartIfRunning, - _In_ BOOLEAN ConnectComms, - _Out_ HANDLE *hPort) + _In_z_ PCWSTR DisplayName, + _Out_ SC_HANDLE *ServiceHandle) { - DWORD Error = ERROR_SUCCESS; WCHAR ServicePath[MAX_PATH]; - SC_HANDLE TestServiceHandle; StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); @@ -60,11 +73,81 @@ KmtFltLoadDriver( StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); - Error = KmtFltCreateAndStartService(TestServiceName, ServicePath, NULL, &TestServiceHandle, TRUE); + return KmtpCreateService(TestServiceName, + ServicePath, + DisplayName, + SERVICE_FILE_SYSTEM_DRIVER, + ServiceHandle); +} + +/** + * @name KmtFltDeleteService + * + * Delete the specified filter driver + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to delete + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD +KmtFltDeleteService( + _In_opt_z_ PCWSTR ServiceName, + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtDeleteService(ServiceName, ServiceHandle); +} - if (Error == ERROR_SUCCESS && ConnectComms) +/** + * @name KmtFltLoadDriver + * + * Delete the specified filter driver + * + * @return Win32 error code + */ +DWORD +KmtFltLoadDriver( + _In_ BOOLEAN EnableDriverLoadPrivlege, + _In_ BOOLEAN RestartIfRunning, + _In_ BOOLEAN ConnectComms, + _Out_ HANDLE *hPort +) +{ + DWORD Error; + + if (EnableDriverLoadPrivlege) + { + Error = EnablePrivilegeInCurrentProcess(SE_LOAD_DRIVER_NAME , TRUE); + if (Error) + { + return Error; + } + } + + Error = KmtFltLoad(TestServiceName); + if ((Error == ERROR_SERVICE_ALREADY_RUNNING) && RestartIfRunning) + { + Error = KmtFltUnload(TestServiceName); + if (Error) + { + // TODO + __debugbreak(); + } + + Error = KmtFltLoad(TestServiceName); + } + + if (Error) { - Error = KmtFltConnect(ServiceName, hPort); + return Error; + } + + if (ConnectComms) + { + Error = KmtFltConnectComms(hPort); } return Error; @@ -77,7 +160,7 @@ KmtFltLoadDriver( * * @param hPort * Handle to the filter's comms port - * @param ConnectComms + * @param DisonnectComms * TRUE to disconnect the comms connection before unloading * * @return Win32 error code @@ -110,6 +193,57 @@ KmtFltUnloadDriver( return Error; } +/** + * @name KmtFltConnectComms + * + * Create a comms connection to the specified filter + * + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltConnectComms( + _Out_ HANDLE *hPort) +{ + return KmtFltConnect(TestServiceName, hPort); +} + +/** + * @name KmtFltDisconnectComms + * + * Disconenct from the comms port + * + * @param hPort + * Handle to the filter's comms port + * + * @return Win32 error code + */ +DWORD +KmtFltDisconnectComms( + _In_ HANDLE hPort) +{ + return KmtFltDisconnect(hPort); +} + + +/** +* @name KmtFltCloseService +* +* Close the specified driver service handle +* +* @param ServiceHandle +* Pointer to a variable containing the service handle. +* Will be set to NULL on success +* +* @return Win32 error code +*/ +DWORD KmtFltCloseService( + _Inout_ SC_HANDLE *ServiceHandle) +{ + return KmtCloseService(ServiceHandle); +} /** * @name KmtFltRunKernelTest @@ -141,7 +275,7 @@ KmtFltRunKernelTest( * @param Message * The message to send to the filter * -* @return Win32 error code as returned by DeviceIoControl +* @return Win32 error code */ DWORD KmtFltSendToDriver( @@ -165,7 +299,7 @@ KmtFltSendToDriver( * @param String * An ANSI string to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendStringToDriver( @@ -190,7 +324,7 @@ KmtFltSendStringToDriver( * @param String * An wide string to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendWStringToDriver( @@ -213,7 +347,7 @@ KmtFltSendWStringToDriver( * @param Value * An 32bit valueng to send to the filter * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendUlongToDriver( @@ -244,7 +378,7 @@ KmtFltSendUlongToDriver( * @param BytesReturned * Number of bytes written in the reply buffer * - * @return Win32 error code as returned by DeviceIoControl + * @return Win32 error code */ DWORD KmtFltSendBufferToDriver( @@ -299,3 +433,154 @@ KmtFltSendBufferToDriver( return Error; } + +/** +* @name KmtFltAddAltitude +* +* Sets up the mini-filter altitude data in the registry +* +* @param hPort +* The altitude string to set +* +* @return Win32 error code +*/ +DWORD +KmtFltAddAltitude( + _In_z_ LPWSTR Altitude) +{ + WCHAR DefaultInstance[128]; + WCHAR KeyPath[256]; + HKEY hKey = NULL; + HKEY hSubKey = NULL; + DWORD Zero = 0; + LONG Error; + + StringCbCopy(KeyPath, sizeof KeyPath, L"SYSTEM\\CurrentControlSet\\Services\\"); + StringCbCat(KeyPath, sizeof KeyPath, TestServiceName); + StringCbCat(KeyPath, sizeof KeyPath, L"\\Instances\\"); + + Error = RegCreateKeyEx(HKEY_LOCAL_MACHINE, + KeyPath, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + NULL, + &hKey, + NULL); + if (Error != ERROR_SUCCESS) + { + return Error; + } + + StringCbCopy(DefaultInstance, sizeof DefaultInstance, TestServiceName); + StringCbCat(DefaultInstance, sizeof DefaultInstance, L" Instance"); + + Error = RegSetValueExW(hKey, + L"DefaultInstance", + 0, + REG_SZ, + (LPBYTE)DefaultInstance, + (wcslen(DefaultInstance) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegCreateKeyW(hKey, DefaultInstance, &hSubKey); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegSetValueExW(hSubKey, + L"Altitude", + 0, + REG_SZ, + (LPBYTE)Altitude, + (wcslen(Altitude) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + goto Quit; + } + + Error = RegSetValueExW(hSubKey, + L"Flags", + 0, + REG_DWORD, + (LPBYTE)&Zero, + sizeof(DWORD)); + +Quit: + if (hSubKey) + { + RegCloseKey(hSubKey); + } + if (hKey) + { + RegCloseKey(hKey); + } + + return Error; + +} + +/* +* Private functions, not meant for use in kmtests +*/ + +DWORD EnablePrivilege( + _In_ HANDLE hToken, + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable) +{ + TOKEN_PRIVILEGES TokenPrivileges; + LUID luid; + BOOL bSuccess; + DWORD dwError = ERROR_SUCCESS; + + /* Get the luid for this privilege */ + if (!LookupPrivilegeValueW(NULL, lpPrivName, &luid)) + return GetLastError(); + + /* Setup the struct with the priv info */ + TokenPrivileges.PrivilegeCount = 1; + TokenPrivileges.Privileges[0].Luid = luid; + TokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; + + /* Enable the privilege info in the token */ + bSuccess = AdjustTokenPrivileges(hToken, + FALSE, + &TokenPrivileges, + sizeof(TOKEN_PRIVILEGES), + NULL, + NULL); + if (bSuccess == FALSE) dwError = GetLastError(); + + /* return status */ + return dwError; +} + +DWORD EnablePrivilegeInCurrentProcess( + _In_z_ LPWSTR lpPrivName, + _In_ BOOL bEnable) +{ + HANDLE hToken; + BOOL bSuccess; + DWORD dwError = ERROR_SUCCESS; + + /* Get a handle to our token */ + bSuccess = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + if (bSuccess == FALSE) return GetLastError(); + + /* Enable the privilege in the agent token */ + dwError = EnablePrivilege(hToken, lpPrivName, bEnable); + + /* We're done with this now */ + CloseHandle(hToken); + + /* return status */ + return dwError; +} diff --git a/modules/rostests/kmtests/kmtest/kmtest.h b/modules/rostests/kmtests/kmtest/kmtest.h index 7329d18e48..f39c418b5d 100644 --- a/modules/rostests/kmtests/kmtest/kmtest.h +++ b/modules/rostests/kmtests/kmtest/kmtest.h @@ -60,16 +60,9 @@ KmtDeleteService( DWORD KmtCloseService( IN OUT SC_HANDLE *ServiceHandle); - -/* FS Filter management functions */ -DWORD -KmtFltCreateService( - _In_z_ PCWSTR ServiceName, - _In_z_ PCWSTR ServicePath, - _In_z_ PCWSTR DisplayName OPTIONAL, - _Out_ SC_HANDLE *ServiceHandle); +#ifdef KMT_FLT_USER_MODE DWORD KmtFltLoad( @@ -132,4 +125,6 @@ KmtFltDeleteService( DWORD KmtFltCloseService( _Inout_ SC_HANDLE *ServiceHandle); +#endif /* KMT_FILTER_DRIVER */ + #endif /* !defined _KMTESTS_H_ */ diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 562691d6f0..01cb31cf53 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -11,6 +11,8 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; +KMT_TESTFUNC Test_FltMgrLoad; +KMT_TESTFUNC Test_FltMgrReg; KMT_TESTFUNC Test_HidPDescription; KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; @@ -37,6 +39,8 @@ const KMT_TEST TestList[] = { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, + { "FltMgrLoad", Test_FltMgrLoad }, + { "FltMgrReg", Test_FltMgrReg }, { "HidPDescription", Test_HidPDescription }, { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c index 2de7f3b159..3bb686de9e 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c @@ -2,7 +2,8 @@ * PROJECT: ReactOS kernel-mode tests - Filter Manager * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: FS Mini-filter wrapper to host the filter manager tests - * PROGRAMMER: Ged Murphy <ged.murphy(a)reactos.org> + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Ged Murphy <ged.murphy(a)reactos.org> */ #include <ntifs.h> @@ -35,6 +36,7 @@ DRIVER_INITIALIZE DriverEntry; /* Globals */ static PDRIVER_OBJECT TestDriverObject; +static PDEVICE_OBJECT KmtestDeviceObject; static FILTER_DATA FilterData; static PFLT_OPERATION_REGISTRATION Callbacks = NULL; static PFLT_CONTEXT_REGISTRATION Contexts = NULL; @@ -133,6 +135,9 @@ DriverEntry( PSECURITY_DESCRIPTOR SecurityDescriptor; UNICODE_STRING DeviceName; WCHAR DeviceNameBuffer[128] = L"\\Device\\Kmtest-"; + UNICODE_STRING KmtestDeviceName; + PFILE_OBJECT KmtestFileObject; + PKMT_DEVICE_EXTENSION KmtestDeviceExtension; PCWSTR DeviceNameSuffix; INT Flags = 0; PKPRCB Prcb; @@ -148,6 +153,32 @@ DriverEntry( KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0; TestDriverObject = DriverObject; + /* get the Kmtest device, so that we get a ResultBuffer pointer */ + RtlInitUnicodeString(&KmtestDeviceName, KMTEST_DEVICE_DRIVER_PATH); + Status = IoGetDeviceObjectPointer(&KmtestDeviceName, FILE_ALL_ACCESS, &KmtestFileObject, &KmtestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Kmtest device object pointer\n"); + goto cleanup; + } + + Status = ObReferenceObjectByPointer(KmtestDeviceObject, FILE_ALL_ACCESS, NULL, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference Kmtest device object\n"); + goto cleanup; + } + + ObDereferenceObject(KmtestFileObject); + KmtestFileObject = NULL; + KmtestDeviceExtension = KmtestDeviceObject->DeviceExtension; + ResultBuffer = KmtestDeviceExtension->ResultBuffer; + DPRINT("KmtestDeviceObject: %p\n", (PVOID)KmtestDeviceObject); + DPRINT("KmtestDeviceExtension: %p\n", (PVOID)KmtestDeviceExtension); + DPRINT("Setting ResultBuffer: %p\n", (PVOID)ResultBuffer); + /* call TestEntry */ RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); @@ -243,6 +274,7 @@ FilterUnload( { PAGED_CODE(); UNREFERENCED_PARAMETER(Flags); + //__debugbreak(); DPRINT("DriverUnload\n"); @@ -312,50 +344,54 @@ FilterInstanceSetup( UNREFERENCED_PARAMETER(FltObjects); UNREFERENCED_PARAMETER(Flags); - RtlInitUnicodeString(&VolumeName, NULL); + if (!(Flags & TESTENTRY_NO_INSTANCE_SETUP)) + { + RtlInitUnicodeString(&VolumeName, NULL); + #if 0 // FltGetVolumeProperties is not yet implemented /* Get the properties of this volume */ - Status = FltGetVolumeProperties(Volume, - VolumeProperties, - sizeof(VolPropBuffer), - &LengthReturned); - if (NT_SUCCESS(Status)) - { - FLT_ASSERT((VolumeProperties->SectorSize == 0) || (VolumeProperties->SectorSize >= MIN_SECTOR_SIZE)); - SectorSize = max(VolumeProperties->SectorSize, MIN_SECTOR_SIZE); - ReportedSectorSize = VolumeProperties->SectorSize; - } - else - { - DPRINT1("Failed to get the volume properties : 0x%X", Status); - return Status; - } + Status = FltGetVolumeProperties(Volume, + VolumeProperties, + sizeof(VolPropBuffer), + &LengthReturned); + if (NT_SUCCESS(Status)) + { + FLT_ASSERT((VolumeProperties->SectorSize == 0) || (VolumeProperties->SectorSize >= MIN_SECTOR_SIZE)); + SectorSize = max(VolumeProperties->SectorSize, MIN_SECTOR_SIZE); + ReportedSectorSize = VolumeProperties->SectorSize; + } + else + { + DPRINT1("Failed to get the volume properties : 0x%X", Status); + return Status; + } #endif - /* Get the storage device object we want a name for */ - Status = FltGetDiskDeviceObject(FltObjects->Volume, &DeviceObject); - if (NT_SUCCESS(Status)) - { - /* Get the dos device name */ - Status = IoVolumeDeviceToDosName(DeviceObject, &VolumeName); + /* Get the storage device object we want a name for */ + Status = FltGetDiskDeviceObject(FltObjects->Volume, &DeviceObject); if (NT_SUCCESS(Status)) { - DPRINT("VolumeDeviceType %lu, VolumeFilesystemType %lu, Real SectSize=0x%04x, Reported SectSize=0x%04x, Name=\"%wZ\"", - VolumeDeviceType, - VolumeFilesystemType, - SectorSize, - ReportedSectorSize, - &VolumeName); - - Status = TestInstanceSetup(FltObjects, - Flags, - VolumeDeviceType, - VolumeFilesystemType, - &VolumeName, - SectorSize, - ReportedSectorSize); - - /* The buffer was allocated by the IoMgr */ - ExFreePool(VolumeName.Buffer); + /* Get the dos device name */ + Status = IoVolumeDeviceToDosName(DeviceObject, &VolumeName); + if (NT_SUCCESS(Status)) + { + DPRINT("VolumeDeviceType %lu, VolumeFilesystemType %lu, Real SectSize=0x%04x, Reported SectSize=0x%04x, Name=\"%wZ\"", + VolumeDeviceType, + VolumeFilesystemType, + SectorSize, + ReportedSectorSize, + &VolumeName); + + Status = TestInstanceSetup(FltObjects, + Flags, + VolumeDeviceType, + VolumeFilesystemType, + &VolumeName, + SectorSize, + ReportedSectorSize); + + /* The buffer was allocated by the IoMgr */ + ExFreePool(VolumeName.Buffer); + } } } @@ -384,7 +420,10 @@ FilterQueryTeardown( { PAGED_CODE(); - TestQueryTeardown(FltObjects, Flags); + if (!(Flags & TESTENTRY_NO_QUERY_TEARDOWN)) + { + TestQueryTeardown(FltObjects, Flags); + } /* We always allow a volume to detach */ return STATUS_SUCCESS;

1 0

[reactos] 01/01: [SHELL32] Update Russian translation, following 6465705
by Stanislav Motylkov 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f884d29c90db2e62ef7f1… commit f884d29c90db2e62ef7f16f908587514ba450357 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Nov 21 14:16:31 2017 +0300 [SHELL32] Update Russian translation, following 6465705 --- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 5c424adadf..3430148392 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -783,8 +783,8 @@ BEGIN IDS_CANTLOCKVOLUME "Не удалось заблокировать том (код ошибки: %lu)." IDS_CANTDISMOUNTVOLUME "Не удалось размонтировать том (код ошибки: %lu)." IDS_CANTEJECTMEDIA "Не удалось извлечь носитель (код ошибки: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Не удалось вывести свойства (код ошибки: %lu)." + IDS_CANTDISCONNECT "Не удалось отсоединить сетевой диск (код ошибки: %lu)." IDS_DIRECTORY "Папка с файлами" IDS_BAT_FILE "Пакетный файл ReactOS"

1 0

[reactos] 01/01: [MSGINA] Fix buttons alignment in French translation
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9904aafd12eb017bf43b7… commit 9904aafd12eb017bf43b7e3fd3cbb512ac64c383 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 11:49:01 2017 +0100 [MSGINA] Fix buttons alignment in French translation --- dll/win32/msgina/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index fd6d0b61aa..cb4a9cb978 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -49,7 +49,7 @@ BEGIN PUSHBUTTON "Verrouiller l'ordinateur", IDC_LOCK, 4, 135, 82, 14 PUSHBUTTON "Déconnecter", IDC_LOGOFF, 93, 135, 85, 14 PUSHBUTTON "Éteindre", IDC_SHUTDOWN, 184, 135, 70, 14 - PUSHBUTTON "Changer le mot de passe", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "Changer le mot de passe", IDC_CHANGEPWD, 4, 154, 82, 14 PUSHBUTTON "Gestionnaire de tâches", IDC_TASKMGR, 93, 154, 85, 14 PUSHBUTTON "Annuler", IDCANCEL, 184, 154, 70, 14 END

1 0

[reactos] 01/01: [FLOPPY] Don't wait forever while trying to determine media type. This should fix some virtual machines and real hardware machine with empty floopy drive not being able to boot ReactOS (stuck while initializing floppy.sys). This fixes a regression introduced in r70746. It could be generalized to other interrupts, floppy controllers not being reliable.
by Pierre Schweitzer 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b34e44782e44afe2af52… commit 4b34e44782e44afe2af5277887d8e7df0d436a87 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 21 10:22:50 2017 +0100 [FLOPPY] Don't wait forever while trying to determine media type. This should fix some virtual machines and real hardware machine with empty floopy drive not being able to boot ReactOS (stuck while initializing floppy.sys). This fixes a regression introduced in r70746. It could be generalized to other interrupts, floppy controllers not being reliable. For more information: http://wiki.osdev.org/Floppy_Disk_Controller CORE-7935 CORE-12908 CORE-13080 --- drivers/storage/floppy/floppy.c | 19 ++++++++++++------- drivers/storage/floppy/floppy.h | 4 ++-- drivers/storage/floppy/readwrite.c | 16 ++++++++++------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/drivers/storage/floppy/floppy.c b/drivers/storage/floppy/floppy.c index d388cf7d37..4234b0f8bb 100644 --- a/drivers/storage/floppy/floppy.c +++ b/drivers/storage/floppy/floppy.c @@ -159,12 +159,13 @@ StopMotor(PCONTROLLER_INFO ControllerInfo) } -VOID NTAPI -WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo) +NTSTATUS NTAPI +WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo, PLARGE_INTEGER Timeout) /* * FUNCTION: Wait for the controller to interrupt, and then clear the event * ARGUMENTS: * ControllerInfo: Controller to wait for + * Timeout: How long to wait for * NOTES: * - There is a small chance that an unexpected or spurious interrupt could * be lost with this clear/wait/clear scheme used in this driver. This is @@ -173,11 +174,15 @@ WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo) * - PAGED_CODE because it waits */ { + NTSTATUS Status; + PAGED_CODE(); ASSERT(ControllerInfo); - KeWaitForSingleObject(&ControllerInfo->SynchEvent, Executive, KernelMode, FALSE, NULL); + Status = KeWaitForSingleObject(&ControllerInfo->SynchEvent, Executive, KernelMode, FALSE, Timeout); KeClearEvent(&ControllerInfo->SynchEvent); + + return Status; } static DRIVER_DISPATCH CreateClose; @@ -262,7 +267,7 @@ Recalibrate(PDRIVE_INFO DriveInfo) continue; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); /* Get the results */ Status = HwRecalibrateResult(DriveInfo->ControllerInfo); @@ -323,7 +328,7 @@ ResetChangeFlag(PDRIVE_INFO DriveInfo) return STATUS_IO_DEVICE_ERROR; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -340,7 +345,7 @@ ResetChangeFlag(PDRIVE_INFO DriveInfo) return STATUS_IO_DEVICE_ERROR; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -701,7 +706,7 @@ InitController(PCONTROLLER_INFO ControllerInfo) INFO_(FLOPPY, "InitController: waiting for initial interrupt\n"); /* Wait for an interrupt */ - WaitForControllerInterrupt(ControllerInfo); + WaitForControllerInterrupt(ControllerInfo, NULL); /* Reset means you have to clear each of the four interrupts (one per drive) */ for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++) diff --git a/drivers/storage/floppy/floppy.h b/drivers/storage/floppy/floppy.h index e1d0efcd88..cd0301ca53 100644 --- a/drivers/storage/floppy/floppy.h +++ b/drivers/storage/floppy/floppy.h @@ -92,8 +92,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); VOID NTAPI SignalMediaChanged(PDEVICE_OBJECT DeviceObject, PIRP Irp); -VOID NTAPI -WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo); +NTSTATUS NTAPI +WaitForControllerInterrupt(PCONTROLLER_INFO ControllerInfo, PLARGE_INTEGER Timeout); NTSTATUS NTAPI ResetChangeFlag(PDRIVE_INFO DriveInfo); diff --git a/drivers/storage/floppy/readwrite.c b/drivers/storage/floppy/readwrite.c index 594d9c7e8b..2ce3a6ccf1 100644 --- a/drivers/storage/floppy/readwrite.c +++ b/drivers/storage/floppy/readwrite.c @@ -170,6 +170,7 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) UCHAR HeadLoadTime; UCHAR HeadUnloadTime; UCHAR StepRateTime; + LARGE_INTEGER Timeout; PAGED_CODE(); @@ -181,9 +182,12 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) * Note that only 1.44 has been tested at all. */ + Timeout.QuadPart = -10000000; /* 1 second. Is that enough? */ + do { int i; + NTSTATUS Status; /* Program data rate */ if(HwSetDataRate(DriveInfo->ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) @@ -219,7 +223,7 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) } /* Wait for the recalibrate to finish */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); RecalStatus = HwRecalibrateResult(DriveInfo->ControllerInfo); @@ -244,9 +248,9 @@ RWDetermineMediaType(PDRIVE_INFO DriveInfo, BOOLEAN OneShot) } /* Wait for the ReadID to finish */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + Status = WaitForControllerInterrupt(DriveInfo->ControllerInfo, &Timeout); - if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) + if(Status == STATUS_TIMEOUT || HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) { WARN_(FLOPPY, "RWDetermineMediaType(): ReadIdResult failed; continuing\n"); if (OneShot) @@ -303,7 +307,7 @@ RWSeekToCylinder(PDRIVE_INFO DriveInfo, UCHAR Cylinder) return STATUS_UNSUCCESSFUL; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { @@ -318,7 +322,7 @@ RWSeekToCylinder(PDRIVE_INFO DriveInfo, UCHAR Cylinder) return STATUS_UNSUCCESSFUL; } - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); if(HwReadIdResult(DriveInfo->ControllerInfo, &CurCylinder, NULL) != STATUS_SUCCESS) { @@ -732,7 +736,7 @@ ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp) * At this point, we block and wait for an interrupt * FIXME: this seems to take too long */ - WaitForControllerInterrupt(DriveInfo->ControllerInfo); + WaitForControllerInterrupt(DriveInfo->ControllerInfo, NULL); /* Read is complete; flush & free adapter channel */ IoFlushAdapterBuffers(DriveInfo->ControllerInfo->AdapterObject, Irp->MdlAddress,

1 0

[reactos] 01/01: [UXTHEME] -Don't change the behaviour of DefWindowProc if SetWindowRgn was called before
by Giannis Adamopoulos 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f98574e1d4a2155061c4… commit 8f98574e1d4a2155061c40816a597b7697aa6654 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Nov 21 10:51:06 2017 +0200 [UXTHEME] -Don't change the behaviour of DefWindowProc if SetWindowRgn was called before --- dll/win32/uxtheme/themehooks.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index 43620d8ff3..48cfdb211a 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -267,8 +267,14 @@ int OnPostWinPosChanged(HWND hWnd, WINDOWPOS* pWinPos) static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) +{ + PWND_DATA pwndData; + + pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); + + if(!IsAppThemed() || + !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) || + (pwndData && pwndData->HasAppDefinedRgn)) { return g_user32ApiHook.DefWindowProcW(hWnd, Msg, @@ -286,7 +292,13 @@ ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) + PWND_DATA pwndData; + + pwndData = (PWND_DATA)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); + + if(!IsAppThemed() || + !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT) || + (pwndData && pwndData->HasAppDefinedRgn)) { return g_user32ApiHook.DefWindowProcA(hWnd, Msg,

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