Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[gedmurphy] 72178: [FLTLIB] - Stub out fltlib.dll. - Add basic implementations for FilterLoad and FilterUnload - Remove the wine code, this lib talks directly to fltmgr.sys and is therefore a react...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Aug 9 22:10:05 2016 New Revision: 72178 URL: http://svn.reactos.org/svn/reactos?rev=72178&view=rev Log: [FLTLIB] - Stub out fltlib.dll. - Add basic implementations for FilterLoad and FilterUnload - Remove the wine code, this lib talks directly to fltmgr.sys and is therefore a reactos only dll from now on. Added: trunk/reactos/dll/win32/fltlib/stubs.c (with props) Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt trunk/reactos/dll/win32/fltlib/fltlib.c trunk/reactos/dll/win32/fltlib/fltlib.spec Modified: trunk/reactos/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] Tue Aug 9 22:10:05 2016 @@ -1,11 +1,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -spec2def(fltlib.dll fltlib.spec) +spec2def(fltlib.dll fltlib.spec ADD_IMPORTLIB) list(APPEND SOURCE fltlib.c - ${CMAKE_CURRENT_BINARY_DIR}/fltlib_stubs.c + stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fltlib.def) add_library(fltlib SHARED ${SOURCE} rsrc.rc) Modified: trunk/reactos/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.c?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] Tue Aug 9 22:10:05 2016 @@ -1,101 +1,165 @@ /* - * Copyright 2009 Detlef Riekenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - +* PROJECT: Filesystem Filter Manager library +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/win32/fltlib/fltlib.c +* PURPOSE: +* PROGRAMMERS: Ged Murphy (ged.murphy(a)reactos.org) +*/ #include <stdarg.h> +#define WIN32_NO_STATUS + #include "windef.h" #include "winbase.h" + +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> + #include "wine/debug.h" + + +/* DATA ****************************************************************************/ WINE_DEFAULT_DEBUG_CHANNEL(fltlib); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +//MOVEME +#define IOCTL_LOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x01, 0, FILE_WRITE_DATA) //88004 +#define IOCTL_UNLOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x02, 0, FILE_WRITE_DATA) //88008 +#define IOCTL_CREATE_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x03, 0, FILE_READ_DATA) //8400c + +static +HRESULT +FilterLoadUnload(_In_z_ LPCWSTR lpFilterName, + _In_ BOOL Load); + +static +DWORD +SendIoctl(_In_ HANDLE Handle, + _In_ ULONG IoControlCode, + _In_reads_bytes_opt_(BufferSize) LPVOID lpInBuffer, + _In_ DWORD BufferSize); + + +/* PUBLIC FUNCTIONS ****************************************************************/ + +_Must_inspect_result_ +HRESULT +WINAPI +FilterLoad(_In_ LPCWSTR lpFilterName) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* use native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; + return FilterLoadUnload(lpFilterName, TRUE); } -/********************************************************************** - * FilterConnectCommunicationPort (FLTLIB.@) - */ -HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOptions, - LPVOID lpContext, DWORD dwSizeOfContext, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - HANDLE *hPort) +_Must_inspect_result_ +HRESULT +WINAPI +FilterUnload(_In_ LPCWSTR lpFilterName) { - FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, - lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); - - *hPort = INVALID_HANDLE_VALUE; - return E_NOTIMPL; + return FilterLoadUnload(lpFilterName, FALSE); } -/********************************************************************** - * FilterFindFirst (FLTLIB.@) - */ -HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, - LPHANDLE handle) + +/* PRIVATE FUNCTIONS ****************************************************************/ + +static +HRESULT +FilterLoadUnload(_In_z_ LPCWSTR lpFilterName, + _In_ BOOL Load) { - FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); - return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); + PUNICODE_STRING FilterName; + HANDLE hFltMgr; + DWORD BufferLength; + DWORD dwError; + + /* Get a handle to the filter manager */ + hFltMgr = CreateFileW(lpFilterName, + GENERIC_READ, + FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + &hFltMgr); + if (hFltMgr == INVALID_HANDLE_VALUE) + { + dwError = GetLastError(); + return HRESULT_FROM_WIN32(dwError); + } + + /* Calc and allocate a buffer to hold our filter name */ + BufferLength = wcslen(lpFilterName) * sizeof(WCHAR); + FilterName = RtlAllocateHeap(GetProcessHeap(), + 0, + BufferLength + sizeof(UNICODE_STRING)); + if (FilterName == NULL) + { + CloseHandle(hFltMgr); + return HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + } + + /* Build up the filter name into a real life string */ + FilterName->Buffer = (PWCH)(FilterName + 1); + FilterName->Length = BufferLength; + FilterName->MaximumLength = BufferLength; + RtlCopyMemory(FilterName->Buffer, lpFilterName, BufferLength); + + /* Tell the filter manager to load the filter for us */ + dwError = SendIoctl(hFltMgr, + Load ? IOCTL_LOAD_FILTER : IOCTL_UNLOAD_FILTER, + FilterName, + BufferLength + sizeof(UNICODE_STRING)); + + /* Cleaup and bail*/ + CloseHandle(hFltMgr); + return HRESULT_FROM_WIN32(dwError); } -/********************************************************************** - * FilterFindClose (FLTLIB.@) - */ -HRESULT WINAPI FilterFindClose(HANDLE handle) +static +DWORD +SendIoctl(_In_ HANDLE Handle, + _In_ ULONG IoControlCode, + _In_reads_bytes_opt_(BufferSize) LPVOID lpInBuffer, + _In_ DWORD BufferSize) { - FIXME("(%p) stub\n", handle); - return S_OK; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtDeviceIoControlFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + IoControlCode, + lpInBuffer, + BufferSize, + NULL, + 0); + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(Handle, FALSE, NULL); + if (NT_SUCCESS(Status)) + { + Status = IoStatusBlock.Status; + } + } + + return RtlNtStatusToDosError(Status); } -/********************************************************************** - * FilterLoad (FLTLIB.@) - */ -HRESULT WINAPI FilterLoad(LPCWSTR filtername) +BOOL +WINAPI +DllMain(_In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _In_ LPVOID lpvReserved) { - FIXME("(%s) stub\n", debugstr_w(filtername)); - return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); -} + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } -/********************************************************************** - * FilterUnload (FLTLIB.@) - */ -HRESULT WINAPI FilterUnload(LPCWSTR filtername) -{ - FIXME("(%s) stub\n", debugstr_w(filtername)); - - if (!filtername) - return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); - - return S_OK; -} + return TRUE; +} Modified: trunk/reactos/dll/win32/fltlib/fltlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.sp… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fltlib/fltlib.spec [iso-8859-1] Tue Aug 9 22:10:05 2016 @@ -1,29 +1,28 @@ -@ stub FilterAttach -@ stub FilterAttachAtAltitude -@ stub FilterClose +@ stdcall FilterAttach(wstr wstr wstr long wstr) +@ stdcall FilterAttachAtAltitude(wstr wstr wstr wstr long wstr) +@ stdcall FilterClose(ptr) @ stdcall FilterConnectCommunicationPort(wstr long ptr long ptr ptr) -@ stub FilterCreate -@ stub FilterDetach +@ stdcall FilterCreate(wstr ptr) +@ stdcall FilterDetach(wstr wstr wstr) @ stdcall FilterFindClose(ptr) @ stdcall FilterFindFirst(long ptr long ptr ptr) -@ stub FilterFindNext -@ stub FilterGetDosName -@ stub FilterGetInformation -@ stub FilterGetMessage -@ stub FilterInstanceClose -@ stub FilterInstanceCreate -@ stub FilterInstanceFindClose -@ stub FilterInstanceFindFirst -@ stub FilterInstanceFindNext -@ stub FilterInstanceGetInformation +@ stdcall FilterFindNext(ptr ptr long ptr ptr) +@ stdcall FilterGetDosName(wstr wstr long) +@ stdcall FilterGetInformation(ptr long ptr long ptr) +@ stdcall FilterGetMessage(ptr ptr long ptr) +@ stdcall FilterInstanceClose(ptr) +@ stdcall FilterInstanceCreate(wstr wstr wstr ptr) +@ stdcall FilterInstanceFindClose(ptr) +@ stdcall FilterInstanceFindFirst(wstr long ptr long ptr ptr) +@ stdcall FilterInstanceFindNext(ptr long ptr long ptr) +@ stdcall FilterInstanceGetInformation(ptr long ptr long ptr) @ stdcall FilterLoad(wstr) -@ stub FilterReplyMessage -@ stub FilterSendMessage +@ stdcall FilterReplyMessage(ptr ptr long) +@ stdcall FilterSendMessage(ptr ptr long ptr long ptr) @ stdcall FilterUnload(wstr) -@ stub FilterVolumeClose -@ stub FilterVolumeFindClose -@ stub FilterVolumeFindFirst -@ stub FilterVolumeFindNext -@ stub FilterVolumeInstanceFindClose -@ stub FilterVolumeInstanceFindFirst -@ stub FilterVolumeInstanceFindNext +@ stdcall FilterVolumeFindClose(ptr) +@ stdcall FilterVolumeFindFirst(long ptr long ptr ptr) +@ stdcall FilterVolumeFindNext(ptr long ptr long ptr) +@ stdcall FilterVolumeInstanceFindClose(ptr) +@ stdcall FilterVolumeInstanceFindFirst(wstr long ptr long ptr ptr) +@ stdcall FilterVolumeInstanceFindNext(ptr long ptr long ptr) Added: trunk/reactos/dll/win32/fltlib/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/fltlib/stubs.c (added) +++ trunk/reactos/dll/win32/fltlib/stubs.c [iso-8859-1] Tue Aug 9 22:10:05 2016 @@ -0,0 +1,403 @@ +/* +* PROJECT: Filesystem Filter Manager library +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll/win32/fltlib/stubs.c +* PURPOSE: +* PROGRAMMERS: Ged Murphy (ged.murphy(a)reactos.org) +*/ + +// Hack - our SDK reports NTDDI_VERSION as 0x05020100 (from _WIN32_WINNT 0x502) +// which doesn't pass the FLT_MGR_BASELINE check in fltkernel.h +#define NTDDI_VERSION NTDDI_WS03SP1 + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include <fltuser.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fltlib); + + +_Must_inspect_result_ +HRESULT +WINAPI +FilterCreate(_In_ LPCWSTR lpFilterName, + _Outptr_ HFILTER *hFilter) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(hFilter); + return E_NOTIMPL; +} + +HRESULT +WINAPI +FilterClose(_In_ HFILTER hFilter) +{ + UNREFERENCED_PARAMETER(hFilter); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceCreate(_In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName, + _Outptr_ HFILTER_INSTANCE *hInstance) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(lpInstanceName); + UNREFERENCED_PARAMETER(hInstance); + return E_NOTIMPL; +} + +HRESULT +WINAPI +FilterInstanceClose(_In_ HFILTER_INSTANCE hInstance) +{ + UNREFERENCED_PARAMETER(hInstance); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterAttach(_In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName, + _In_opt_ DWORD dwCreatedInstanceNameLength, + _Out_writes_bytes_opt_(dwCreatedInstanceNameLength) LPWSTR lpCreatedInstanceName) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(lpInstanceName); + UNREFERENCED_PARAMETER(dwCreatedInstanceNameLength); + UNREFERENCED_PARAMETER(lpCreatedInstanceName); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterAttachAtAltitude(_In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_ LPCWSTR lpAltitude, + _In_opt_ LPCWSTR lpInstanceName, + _In_opt_ DWORD dwCreatedInstanceNameLength, + _Out_writes_bytes_opt_(dwCreatedInstanceNameLength) LPWSTR lpCreatedInstanceName) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(lpAltitude); + UNREFERENCED_PARAMETER(lpInstanceName); + UNREFERENCED_PARAMETER(dwCreatedInstanceNameLength); + UNREFERENCED_PARAMETER(lpCreatedInstanceName); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterDetach(_In_ LPCWSTR lpFilterName, + _In_ LPCWSTR lpVolumeName, + _In_opt_ LPCWSTR lpInstanceName +) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(lpInstanceName); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindFirst(_In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpFilterFind) +{ + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + UNREFERENCED_PARAMETER(lpFilterFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindNext(_In_ HANDLE hFilterFind, + _In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hFilterFind); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterFindClose(_In_ HANDLE hFilterFind) +{ + UNREFERENCED_PARAMETER(hFilterFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeFindFirst(_In_ FILTER_VOLUME_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ PHANDLE lpVolumeFind) +{ + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + UNREFERENCED_PARAMETER(lpVolumeFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeFindNext(_In_ HANDLE hVolumeFind, + _In_ FILTER_VOLUME_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hVolumeFind); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +HRESULT +WINAPI +FilterVolumeFindClose(_In_ HANDLE hVolumeFind) +{ + UNREFERENCED_PARAMETER(hVolumeFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindFirst(_In_ LPCWSTR lpFilterName, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpFilterInstanceFind) +{ + UNREFERENCED_PARAMETER(lpFilterName); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + UNREFERENCED_PARAMETER(lpFilterInstanceFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindNext(_In_ HANDLE hFilterInstanceFind, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + + UNREFERENCED_PARAMETER(hFilterInstanceFind); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceFindClose(_In_ HANDLE hFilterInstanceFind) +{ + UNREFERENCED_PARAMETER(hFilterInstanceFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeInstanceFindFirst(_In_ LPCWSTR lpVolumeName, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned, + _Out_ LPHANDLE lpVolumeInstanceFind) +{ + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + UNREFERENCED_PARAMETER(lpVolumeInstanceFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterVolumeInstanceFindNext(_In_ HANDLE hVolumeInstanceFind, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hVolumeInstanceFind); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +HRESULT +WINAPI +FilterVolumeInstanceFindClose(_In_ HANDLE hVolumeInstanceFind) +{ + UNREFERENCED_PARAMETER(hVolumeInstanceFind); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetInformation(_In_ HFILTER hFilter, + _In_ FILTER_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hFilter); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterInstanceGetInformation(_In_ HFILTER_INSTANCE hInstance, + _In_ INSTANCE_INFORMATION_CLASS dwInformationClass, + _Out_writes_bytes_to_(dwBufferSize, *lpBytesReturned) LPVOID lpBuffer, + _In_ DWORD dwBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hInstance); + UNREFERENCED_PARAMETER(dwInformationClass); + UNREFERENCED_PARAMETER(lpBuffer); + UNREFERENCED_PARAMETER(dwBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + + +_Must_inspect_result_ +HRESULT +WINAPI +FilterConnectCommunicationPort(_In_ LPCWSTR lpPortName, + _In_ DWORD dwOptions, + _In_reads_bytes_opt_(wSizeOfContext) LPCVOID lpContext, + _In_ WORD wSizeOfContext, + _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, + _Outptr_ HANDLE *hPort) +{ + UNREFERENCED_PARAMETER(lpPortName); + UNREFERENCED_PARAMETER(dwOptions); + UNREFERENCED_PARAMETER(lpContext); + UNREFERENCED_PARAMETER(wSizeOfContext); + UNREFERENCED_PARAMETER(lpSecurityAttributes); + UNREFERENCED_PARAMETER(hPort); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterSendMessage(_In_ HANDLE hPort, + _In_reads_bytes_(dwInBufferSize) LPVOID lpInBuffer, + _In_ DWORD dwInBufferSize, + _Out_writes_bytes_to_opt_(dwOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer, + _In_ DWORD dwOutBufferSize, + _Out_ LPDWORD lpBytesReturned) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpInBuffer); + UNREFERENCED_PARAMETER(dwInBufferSize); + UNREFERENCED_PARAMETER(lpOutBuffer); + UNREFERENCED_PARAMETER(dwOutBufferSize); + UNREFERENCED_PARAMETER(lpBytesReturned); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetMessage(_In_ HANDLE hPort, + _Out_writes_bytes_(dwMessageBufferSize) PFILTER_MESSAGE_HEADER lpMessageBuffer, + _In_ DWORD dwMessageBufferSize, + _Inout_opt_ LPOVERLAPPED lpOverlapped) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpMessageBuffer); + UNREFERENCED_PARAMETER(dwMessageBufferSize); + UNREFERENCED_PARAMETER(lpOverlapped); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterReplyMessage(_In_ HANDLE hPort, + _In_reads_bytes_(dwReplyBufferSize) PFILTER_REPLY_HEADER lpReplyBuffer, + _In_ DWORD dwReplyBufferSize) +{ + UNREFERENCED_PARAMETER(hPort); + UNREFERENCED_PARAMETER(lpReplyBuffer); + UNREFERENCED_PARAMETER(dwReplyBufferSize); + return E_NOTIMPL; +} + +_Must_inspect_result_ +HRESULT +WINAPI +FilterGetDosName(_In_ LPCWSTR lpVolumeName, + _Out_writes_(dwDosNameBufferSize) LPWSTR lpDosName, + _In_ DWORD dwDosNameBufferSize) +{ + UNREFERENCED_PARAMETER(lpVolumeName); + UNREFERENCED_PARAMETER(lpDosName); + UNREFERENCED_PARAMETER(dwDosNameBufferSize); + return E_NOTIMPL; +} Propchange: trunk/reactos/dll/win32/fltlib/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[dchapyshev] 72177: [INPUT] - Rename input_new to input

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 9 21:49:06 2016 New Revision: 72177 URL: http://svn.reactos.org/svn/reactos?rev=72177&view=rev Log: [INPUT] - Rename input_new to input Added: trunk/reactos/dll/cpl/input/ - copied from r72176, trunk/reactos/dll/cpl/input_new/ Removed: trunk/reactos/dll/cpl/input_new/ Modified: trunk/reactos/dll/cpl/CMakeLists.txt trunk/reactos/dll/cpl/input/CMakeLists.txt Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Tue Aug 9 21:49:06 2016 @@ -6,7 +6,6 @@ add_subdirectory(hdwwiz) add_subdirectory(inetcpl) add_subdirectory(input) -#add_subdirectory(input_new) add_subdirectory(intl) add_subdirectory(joy) #add_subdirectory(liccpa)#disabled in trunk Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] Tue Aug 9 21:49:06 2016 @@ -1,6 +1,5 @@ -PROJECT(INPUT_NEW) -spec2def(input_new.dll input.spec) +spec2def(input.dll input.spec) list(APPEND SOURCE input.c @@ -20,12 +19,12 @@ add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico) -add_library(input_new SHARED +add_library(input SHARED ${SOURCE} input.rc - ${CMAKE_CURRENT_BINARY_DIR}/input_new.def) + ${CMAKE_CURRENT_BINARY_DIR}/input.def) -set_module_type(input_new win32dll UNICODE) -add_importlibs(input_new advapi32 user32 comctl32 gdi32 msvcrt kernel32 setupapi) -add_pch(input_new input.h SOURCE) -add_cd_file(TARGET input_new DESTINATION reactos/system32 FOR all) +set_module_type(input win32dll UNICODE) +add_importlibs(input advapi32 user32 comctl32 gdi32 msvcrt kernel32 setupapi) +add_pch(input input.h SOURCE) +add_cd_file(TARGET input DESTINATION reactos/system32 FOR all)

8 years, 2 months

[dchapyshev] 72176: [INPUT] - Remove old input.dll

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 9 21:45:58 2016 New Revision: 72176 URL: http://svn.reactos.org/svn/reactos?rev=72176&view=rev Log: [INPUT] - Remove old input.dll Removed: trunk/reactos/dll/cpl/input/

8 years, 2 months

[dchapyshev] 72175: [KBSWITCH] - Hackfix detecting keyboard layout switching * Now when hotkeys switching layouts icon changes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 9 21:41:05 2016 New Revision: 72175 URL: http://svn.reactos.org/svn/reactos?rev=72175&view=rev Log: [KBSWITCH] - Hackfix detecting keyboard layout switching * Now when hotkeys switching layouts icon changes Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue Aug 9 21:41:05 2016 @@ -12,6 +12,7 @@ PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; PKBSWITCHDELETEHOOKS KbSwitchDeleteHooks = NULL; +UINT ShellHookMessage = 0; static BOOL @@ -524,6 +525,12 @@ break; } + if (Message == ShellHookMessage && wParam == HSHELL_LANGUAGE) + { + PostMessage(hwnd, WM_LANG_CHANGED, wParam, lParam); + return 0; + } + return DefWindowProc(hwnd, Message, wParam, lParam); } @@ -533,6 +540,7 @@ WNDCLASS WndClass = {0}; MSG msg; HANDLE hMutex; + HWND hwnd; switch (GetUserDefaultUILanguage()) { @@ -573,7 +581,9 @@ return 1; } - CreateWindow(szKbSwitcherName, NULL, 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + hwnd = CreateWindow(szKbSwitcherName, NULL, 0, 0, 0, 1, 1, HWND_DESKTOP, NULL, hInstance, NULL); + ShellHookMessage = RegisterWindowMessage(L"SHELLHOOK"); + RegisterShellHookWindow(hwnd); while(GetMessage(&msg,NULL,0,0)) {

8 years, 2 months

[gedmurphy] 72174: [FLTMC] - Start to implement fltMC - It currently supports loading, unloading and listing loaded filter driver.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Aug 9 21:33:53 2016 New Revision: 72174 URL: http://svn.reactos.org/svn/reactos?rev=72174&view=rev Log: [FLTMC] - Start to implement fltMC - It currently supports loading, unloading and listing loaded filter driver. Added: trunk/reactos/base/applications/fltmc/ trunk/reactos/base/applications/fltmc/CMakeLists.txt (with props) trunk/reactos/base/applications/fltmc/fltmc.cpp (with props) trunk/reactos/base/applications/fltmc/fltmc.rc (with props) trunk/reactos/base/applications/fltmc/lang/ trunk/reactos/base/applications/fltmc/lang/en-US.rc (with props) trunk/reactos/base/applications/fltmc/resource.h (with props) Added: trunk/reactos/base/applications/fltmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/CM… ============================================================================== --- trunk/reactos/base/applications/fltmc/CMakeLists.txt (added) +++ trunk/reactos/base/applications/fltmc/CMakeLists.txt [iso-8859-1] Tue Aug 9 21:33:53 2016 @@ -0,0 +1,9 @@ + +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) + +add_executable(fltmc fltmc.cpp fltmc.rc) +set_module_type(fltmc win32cui UNICODE) +add_importlibs(fltmc fltlib msvcrt kernel32 advapi32) +add_cd_file(TARGET fltmc DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/fltmc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/fltmc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.cpp (added) +++ trunk/reactos/base/applications/fltmc/fltmc.cpp [iso-8859-1] Tue Aug 9 21:33:53 2016 @@ -0,0 +1,301 @@ +/* +* PROJECT: ReactOS fltmc utility +* LICENSE: GPL - See COPYING in the top level directory +* FILE: base/applications/fltmc/fltmc.c +* PURPOSE: Control utility for file system filter drivers +* PROGRAMMERS: Copyright 2016 Ged Murphy (gedmurphy(a)gmail.com) +*/ + +//FIXME +#define NTDDI_VERSION NTDDI_WIN7 + +// Please leave this temporary hack in place +// it's used to keep VS2015 happy for development. +#ifdef __REACTOS__ +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wchar.h> +#else +#include <Windows.h> +#endif +#include <fltUser.h> +#include <atlstr.h> +#include "resource.h" + +EXTERN_C int wmain(int argc, WCHAR *argv[]); + +void +LoadAndPrintString(ULONG MessageId, ...) +{ + va_list args; + + CAtlStringW Message; + if (Message.LoadStringW(MessageId)) + { + va_start(args, MessageId); + vwprintf(Message.GetBuffer(), args); + va_end(args); + } +} + +void +PrintErrorText(_In_ ULONG ErrorCode) +{ + WCHAR Buffer[256]; + if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, + 0, + ErrorCode, + 0, + Buffer, + 256, + 0)) + { + wprintf(L"%s\n", Buffer); + } +} + +DWORD +SetDriverLoadPrivilege() +{ + TOKEN_PRIVILEGES TokenPrivileges; + HANDLE hToken; + LUID luid; + BOOL bSuccess; + DWORD dwError = ERROR_SUCCESS; + + bSuccess = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (bSuccess == FALSE) + return GetLastError(); + + if (!LookupPrivilegeValueW(NULL, SE_LOAD_DRIVER_NAME, &luid)) + return GetLastError(); + + TokenPrivileges.PrivilegeCount = 1; + TokenPrivileges.Privileges[0].Luid = luid; + TokenPrivileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + bSuccess = AdjustTokenPrivileges(hToken, + FALSE, + &TokenPrivileges, + sizeof(TOKEN_PRIVILEGES), + NULL, + NULL); + if (bSuccess == FALSE) + dwError = GetLastError(); + + CloseHandle(hToken); + + return dwError; +} + +void +LoadFilter(_In_ LPWSTR FilterName) +{ + DWORD dwError; + dwError = SetDriverLoadPrivilege(); + if (dwError != ERROR_SUCCESS) + { + LoadAndPrintString(IDS_ERROR_PRIV, HRESULT_FROM_WIN32(dwError)); + return; + } + + HRESULT hr = FilterLoad(FilterName); + if (hr != S_OK) + { + LoadAndPrintString(IDS_ERROR_LOAD, hr); + PrintErrorText(hr); + } +} + +void +UnloadFilter(_In_ LPWSTR FilterName) +{ + DWORD dwError; + dwError = SetDriverLoadPrivilege(); + if (dwError != ERROR_SUCCESS) + { + LoadAndPrintString(IDS_ERROR_PRIV, HRESULT_FROM_WIN32(dwError)); + return; + } + + HRESULT hr = FilterUnload(FilterName); + if (hr != S_OK) + { + LoadAndPrintString(IDS_ERROR_UNLOAD, hr); + PrintErrorText(hr); + } +} + +void +PrintFilterInfo(_In_ PVOID Buffer, + _In_ BOOL IsNewStyle) +{ + WCHAR FilterName[128] = { 0 }; + WCHAR Altitude[64] = { 0 }; + + if (IsNewStyle) + { + PFILTER_AGGREGATE_STANDARD_INFORMATION FilterAggInfo; + FilterAggInfo = (PFILTER_AGGREGATE_STANDARD_INFORMATION)Buffer; + + if (FilterAggInfo->Type.MiniFilter.FilterNameLength < 128) + { + CopyMemory(FilterName, + (PCHAR)FilterAggInfo + FilterAggInfo->Type.MiniFilter.FilterNameBufferOffset, + FilterAggInfo->Type.MiniFilter.FilterNameLength); + FilterName[FilterAggInfo->Type.MiniFilter.FilterNameLength] = UNICODE_NULL; + } + + if (FilterAggInfo->Type.MiniFilter.FilterNameLength < 64) + { + CopyMemory(Altitude, + (PCHAR)FilterAggInfo + FilterAggInfo->Type.MiniFilter.FilterAltitudeBufferOffset, + FilterAggInfo->Type.MiniFilter.FilterAltitudeLength); + FilterName[FilterAggInfo->Type.MiniFilter.FilterAltitudeLength] = UNICODE_NULL; + } + + wprintf(L"%-38s %-10lu %-10s %-10lu\n", + FilterName, + FilterAggInfo->Type.MiniFilter.NumberOfInstances, + Altitude, + FilterAggInfo->Type.MiniFilter.FrameID); + } + else + { + PFILTER_FULL_INFORMATION FilterInfo; + FilterInfo = (PFILTER_FULL_INFORMATION)Buffer; + + if (FilterInfo->FilterNameLength < 128) + { + CopyMemory(FilterName, + FilterInfo->FilterNameBuffer, + FilterInfo->FilterNameLength); + FilterName[FilterInfo->FilterNameLength] = UNICODE_NULL; + } + + wprintf(L"%-38s %-10lu %-10lu\n", + FilterName, + FilterInfo->NumberOfInstances, + FilterInfo->FrameID); + } +} + +void +ListFilters() +{ + HANDLE FindHandle; + BYTE Buffer[1024]; + ULONG BytesReturned; + BOOL IsNewStyle = TRUE; + HRESULT hr; + + hr = FilterFindFirst(FilterAggregateStandardInformation, + Buffer, + 1024, + &BytesReturned, + &FindHandle); + if (!SUCCEEDED(hr)) + { + IsNewStyle = FALSE; + hr = FilterFindFirst(FilterFullInformation, + Buffer, + 1024, + &BytesReturned, + &FindHandle); + } + + if (SUCCEEDED(hr)) + { + if (IsNewStyle) + { + LoadAndPrintString(IDS_DISPLAY_FILTERS1); + wprintf(L"------------------------------ ------------- ------------ -----\n"); + } + else + { + LoadAndPrintString(IDS_DISPLAY_FILTERS2); + wprintf(L"------------------------------ ------------- -----\n"); + } + + PrintFilterInfo(Buffer, IsNewStyle); + + do + { + hr = FilterFindNext(FindHandle, + IsNewStyle ? FilterAggregateStandardInformation : FilterFullInformation, + Buffer, + 1024, + &BytesReturned); + if (SUCCEEDED(hr)) + { + PrintFilterInfo(Buffer, IsNewStyle); + } + + } while (SUCCEEDED(hr)); + + FilterFindClose(FindHandle); + } + + if (!SUCCEEDED(hr) && hr != HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)) + { + LoadAndPrintString(IDS_ERROR_PRIV, hr); + PrintErrorText(hr); + } +} + +int wmain(int argc, WCHAR *argv[]) +{ + if (argc < 2) + { + LoadAndPrintString(IDS_USAGE); + return 0; + } + + wprintf(L"\n"); + + if (!_wcsicmp(argv[1], L"help")) + { + LoadAndPrintString(IDS_USAGE); + } + else if (!_wcsicmp(argv[1], L"load")) + { + if (argc == 3) + { + LoadFilter(argv[2]); + } + else + { + LoadAndPrintString(IDS_USAGE_LOAD); + wprintf(L"fltmc.exe load [name]\n\n"); + } + } + else if (!_wcsicmp(argv[1], L"unload")) + { + if (argc == 3) + { + UnloadFilter(argv[2]); + } + else + { + LoadAndPrintString(IDS_USAGE_UNLOAD); + wprintf(L"fltmc.exe unload [name]\n\n"); + } + } + else if (!_wcsicmp(argv[1], L"filters")) + { + if (argc == 2) + { + ListFilters(); + } + else + { + LoadAndPrintString(IDS_USAGE_FILTERS); + wprintf(L"fltmc.exe filters\n\n"); + } + } + + return 0; +} Propchange: trunk/reactos/base/applications/fltmc/fltmc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/fltmc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/fl… ============================================================================== --- trunk/reactos/base/applications/fltmc/fltmc.rc (added) +++ trunk/reactos/base/applications/fltmc/fltmc.rc [iso-8859-1] Tue Aug 9 21:33:53 2016 @@ -0,0 +1,60 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Filter Manager Control Program" +#define REACTOS_STR_INTERNAL_NAME "fltmc" +#define REACTOS_STR_ORIGINAL_FILENAME "fltmc.exe" +//#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +//#ifdef LANGUAGE_BG_BG +// #include "lang/bg-BG.rc" +//#endif +//#ifdef LANGUAGE_CS_CZ +// #include "lang/cs-CZ.rc" +//#endif +//#ifdef LANGUAGE_DE_DE +// #include "lang/de-DE.rc" +//#endif +//#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +//#endif +//#ifdef LANGUAGE_ES_ES +// #include "lang/es-ES.rc" +//#endif +//#ifdef LANGUAGE_FR_FR +// #include "lang/fr-FR.rc" +//#endif +//#ifdef LANGUAGE_IT_IT +// #include "lang/it-IT.rc" +//#endif +//#ifdef LANGUAGE_PL_PL +// #include "lang/pl-PL.rc" +//#endif +//#ifdef LANGUAGE_RO_RO +// #include "lang/ro-RO.rc" +//#endif +//#ifdef LANGUAGE_RU_RU +// #include "lang/ru-RU.rc" +//#endif +//#ifdef LANGUAGE_SV_SE +// #include "lang/sv-SE.rc" +//#endif +//#ifdef LANGUAGE_SQ_AL +// #include "lang/sq-AL.rc" +//#endif +//#ifdef LANGUAGE_TR_TR +// #include "lang/tr-TR.rc" +//#endif +//#ifdef LANGUAGE_UK_UA +// #include "lang/uk-UA.rc" +//#endif +//#ifdef LANGUAGE_ZH_CN +// #include "lang/zh-CN.rc" +//#endif +//#ifdef LANGUAGE_ZH_TW +// #include "lang/zh-TW.rc" +//#endif Propchange: trunk/reactos/base/applications/fltmc/fltmc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… ============================================================================== --- trunk/reactos/base/applications/fltmc/lang/en-US.rc (added) +++ trunk/reactos/base/applications/fltmc/lang/en-US.rc [iso-8859-1] Tue Aug 9 21:33:53 2016 @@ -0,0 +1,27 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "\nValid commands :\n\ + load Loads a Filter driver\n\ + unload Unloads a Filter driver\n\ + filters Lists the Filters currently registered in the system\n\n\0" + + IDS_USAGE_LOAD "Loads a filter driver\n\0" + IDS_USAGE_UNLOAD "Unloads a filter driver\n\0" + IDS_USAGE_FILTERS "Lists all registered filters\n\0" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_FILTERS1 "Filter Name Num Instances Altitude Frame\n\0" + IDS_DISPLAY_FILTERS2 "Filter Name Num Instances Frame\n\0" +END + +STRINGTABLE +BEGIN + IDS_ERROR_PRIV "Failed to set the driver load privilige (0x%X)\n\0" + IDS_ERROR_FILTERS "Failed to list the filters (0x%X)\n\0" + IDS_ERROR_LOAD "Failed to load the filter (0x%X)\n\0" + IDS_ERROR_UNLOAD "Failed to unload the filter (0x%X)\n\0" +END Propchange: trunk/reactos/base/applications/fltmc/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fltmc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/re… ============================================================================== --- trunk/reactos/base/applications/fltmc/resource.h (added) +++ trunk/reactos/base/applications/fltmc/resource.h [iso-8859-1] Tue Aug 9 21:33:53 2016 @@ -0,0 +1,14 @@ +#pragma once + +#define IDS_USAGE 0 +#define IDS_USAGE_LOAD 1 +#define IDS_USAGE_UNLOAD 2 +#define IDS_USAGE_FILTERS 3 + +#define IDS_DISPLAY_FILTERS1 10 +#define IDS_DISPLAY_FILTERS2 11 + +#define IDS_ERROR_PRIV 20 +#define IDS_ERROR_FILTERS 21 +#define IDS_ERROR_LOAD 22 +#define IDS_ERROR_UNLOAD 23 Propchange: trunk/reactos/base/applications/fltmc/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[gedmurphy] 72173: [FLTLIB_APITEST] - Create a skeleton test project for fltlib.dll - Not yet part of the build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Aug 9 21:23:40 2016 New Revision: 72173 URL: http://svn.reactos.org/svn/reactos?rev=72173&view=rev Log: [FLTLIB_APITEST] - Create a skeleton test project for fltlib.dll - Not yet part of the build Added: trunk/rostests/apitests/fltlib/ trunk/rostests/apitests/fltlib/CMakeLists.txt (with props) trunk/rostests/apitests/fltlib/comms.c (with props) trunk/rostests/apitests/fltlib/filter_find.c (with props) trunk/rostests/apitests/fltlib/handles.c (with props) trunk/rostests/apitests/fltlib/info.c (with props) trunk/rostests/apitests/fltlib/instance.c (with props) trunk/rostests/apitests/fltlib/instance_find.c (with props) trunk/rostests/apitests/fltlib/load.c (with props) trunk/rostests/apitests/fltlib/testlist.c (with props) trunk/rostests/apitests/fltlib/volume_find.c (with props) Added: trunk/rostests/apitests/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/CMakeList… ============================================================================== --- trunk/rostests/apitests/fltlib/CMakeLists.txt (added) +++ trunk/rostests/apitests/fltlib/CMakeLists.txt [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,16 @@ + +list(APPEND SOURCE + load.c + handles.c + instance.c + instance_find.c + filter_find.c + volume_find.c + info.c + comms.c + testlist.c) + +add_executable(fltlib_apitest ${SOURCE}) +set_module_type(fltlib_apitest win32cui) +add_importlibs(fltlib_apitest user32 msvcrt kernel32) +add_cd_file(TARGET fltlib_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/fltlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/comms.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/comms.c?r… ============================================================================== --- trunk/rostests/apitests/fltlib/comms.c (added) +++ trunk/rostests/apitests/fltlib/comms.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,45 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterConnectCommunicationPort +// FilterSendMessage +// FilterGetMessage +// FilterReplyMessage +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(comms) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/comms.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/filter_find.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/filter_fi… ============================================================================== --- trunk/rostests/apitests/fltlib/filter_find.c (added) +++ trunk/rostests/apitests/fltlib/filter_find.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,47 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterFindFirst +// FilterFindNext +// FilterFindClose +// FilterVolumeFindFirst +// FilterVolumeFindNext +// FilterVolumeFindClose +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(filter_find) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/filter_find.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/handles.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/handles.c… ============================================================================== --- trunk/rostests/apitests/fltlib/handles.c (added) +++ trunk/rostests/apitests/fltlib/handles.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,45 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterCreate +// FilterClose +// FilterInstanceCreate +// FilterInstanceClose +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(handles) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/handles.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/info.c?re… ============================================================================== --- trunk/rostests/apitests/fltlib/info.c (added) +++ trunk/rostests/apitests/fltlib/info.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,44 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterGetInformation +// FilterInstanceGetInformation +// FilterGetDosName +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(info) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/info.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/instance.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/instance.… ============================================================================== --- trunk/rostests/apitests/fltlib/instance.c (added) +++ trunk/rostests/apitests/fltlib/instance.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,44 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterAttach +// FilterAttachAtAltitude +// FilterDetach +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(instance) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/instance.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/instance_find.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/instance_… ============================================================================== --- trunk/rostests/apitests/fltlib/instance_find.c (added) +++ trunk/rostests/apitests/fltlib/instance_find.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,44 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterInstanceFindFirst +// FilterInstanceFindNext +// FilterInstanceFindClose +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(instance_find) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/instance_find.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/load.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/load.c?re… ============================================================================== --- trunk/rostests/apitests/fltlib/load.c (added) +++ trunk/rostests/apitests/fltlib/load.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,44 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterLoad +// FilterUnload +// + + +static void test_FIXME(void) +{ + +} + + +START_TEST(load) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/load.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/testlist.… ============================================================================== --- trunk/rostests/apitests/fltlib/testlist.c (added) +++ trunk/rostests/apitests/fltlib/testlist.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,26 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_load(void); +extern void func_handles(void); +extern void func_instance(void); +extern void func_instance_find(void); +extern void func_filter_find(void); +extern void func_volume_find(void); +extern void func_info(void); +extern void func_comms(void); + +const struct test winetest_testlist[] = +{ + { "load", func_load }, + { "handles", func_handles}, + { "instance", func_instance }, + { "instance_find", func_instance_find }, + { "filter_find", func_filter_find }, + { "volume_find", func_volume_find }, + { "info", func_info }, + { "comms", func_comms }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/fltlib/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/fltlib/volume_find.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/fltlib/volume_fi… ============================================================================== --- trunk/rostests/apitests/fltlib/volume_find.c (added) +++ trunk/rostests/apitests/fltlib/volume_find.c [iso-8859-1] Tue Aug 9 21:23:40 2016 @@ -0,0 +1,44 @@ +/* +* FltLib related functions tests +* +* Copyright 2016 Ged Murphy (ged.murphy(a)reactos.org) +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this library; if not, write to the Free Software Foundation, +* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +*/ + +#include <apitest.h> +#include <stdio.h> +#include <assert.h> +#include <winuser.h> +#include <winreg.h> +#include <winsvc.h> + +// +// Tests for: +// FilterVolumeInstanceFindFirst +// FilterVolumeInstanceFindNext +// FilterVolumeInstanceFindClose +// + +static void test_FIXME(void) +{ + +} + + +START_TEST(volume_find) +{ + test_FIXME(); +} Propchange: trunk/rostests/apitests/fltlib/volume_find.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[dchapyshev] 72172: [INPUT] - Small fix :-p

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 9 21:09:07 2016 New Revision: 72172 URL: http://svn.reactos.org/svn/reactos?rev=72172&view=rev Log: [INPUT] - Small fix :-p Modified: trunk/reactos/dll/cpl/input_new/add_dialog.c Modified: trunk/reactos/dll/cpl/input_new/add_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/add_dial… ============================================================================== --- trunk/reactos/dll/cpl/input_new/add_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/add_dialog.c [iso-8859-1] Tue Aug 9 21:09:07 2016 @@ -17,7 +17,7 @@ DWORD dwResult = 0; HINF hIntlInf; - hIntlInf = SetupOpenInfFileW(L"G:\\Projects\\_ReactOS\\reactos\\output-MinGW-i386\\dll\\cpl\\input_new\\intl.inf", NULL, INF_STYLE_WIN4, NULL); + hIntlInf = SetupOpenInfFileW(L"intl.inf", NULL, INF_STYLE_WIN4, NULL); if (hIntlInf != INVALID_HANDLE_VALUE) { WCHAR szLangID[MAX_STR_LEN];

8 years, 2 months

[dchapyshev] 72171: [INPUT] - Implement 'Key Settings' and 'Change Key Settings' dialogs * Now you can add, delete and change the input method, change the hotkey switching input methods. The system...

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 9 21:03:55 2016 New Revision: 72171 URL: http://svn.reactos.org/svn/reactos?rev=72171&view=rev Log: [INPUT] - Implement 'Key Settings' and 'Change Key Settings' dialogs * Now you can add, delete and change the input method, change the hotkey switching input methods. The system correctly responds to changes. It works fine in Windows 10, but has not yet been tested on ReactOS Added: trunk/reactos/dll/cpl/input_new/key_sequence_dialog.c (with props) Modified: trunk/reactos/dll/cpl/input_new/CMakeLists.txt trunk/reactos/dll/cpl/input_new/add_dialog.c trunk/reactos/dll/cpl/input_new/input.h trunk/reactos/dll/cpl/input_new/input_list.c trunk/reactos/dll/cpl/input_new/key_settings_dialog.c trunk/reactos/dll/cpl/input_new/settings_page.c Modified: trunk/reactos/dll/cpl/input_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/CMakeLis… ============================================================================== --- trunk/reactos/dll/cpl/input_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/CMakeLists.txt [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -15,7 +15,8 @@ advanced_settings_page.c add_dialog.c edit_dialog.c - key_settings_dialog.c) + key_settings_dialog.c + key_sequence_dialog.c) add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico) Modified: trunk/reactos/dll/cpl/input_new/add_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/add_dial… ============================================================================== --- trunk/reactos/dll/cpl/input_new/add_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/add_dialog.c [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -17,7 +17,7 @@ DWORD dwResult = 0; HINF hIntlInf; - hIntlInf = SetupOpenInfFileW(L"intl.inf", NULL, INF_STYLE_WIN4, NULL); + hIntlInf = SetupOpenInfFileW(L"G:\\Projects\\_ReactOS\\reactos\\output-MinGW-i386\\dll\\cpl\\input_new\\intl.inf", NULL, INF_STYLE_WIN4, NULL); if (hIntlInf != INVALID_HANDLE_VALUE) { WCHAR szLangID[MAX_STR_LEN]; Modified: trunk/reactos/dll/cpl/input_new/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.h?… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/input.h [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -56,8 +56,20 @@ EditDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* key_settings_dialog.c */ + +typedef struct +{ + DWORD dwAttributes; + DWORD dwLanguage; + DWORD dwLayout; +} KEY_SETTINGS; + INT_PTR CALLBACK KeySettingsDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* key_sequence_dialog.c */ +INT_PTR CALLBACK +ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static inline WCHAR* Modified: trunk/reactos/dll/cpl/input_new/input_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input_li… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input_list.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/input_list.c [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -110,11 +110,8 @@ { RegDeleteKeyW(hKey, L"Preload"); RegDeleteKeyW(hKey, L"Substitutes"); - //RegDeleteKeyW(hKey, L"Toggle"); RegCloseKey(hKey); - - RegDeleteKeyW(HKEY_CURRENT_USER, L"Keyboard Layout"); } if (RegCreateKeyW(HKEY_CURRENT_USER, L"Keyboard Layout", &hKey) != ERROR_SUCCESS) @@ -130,13 +127,6 @@ RegCloseKey(hTempKey); if (RegCreateKeyW(hKey, L"Substitutes", &hTempKey) != ERROR_SUCCESS) - { - goto Cleanup; - } - - RegCloseKey(hTempKey); - - if (RegCreateKeyW(hKey, L"Toggle", &hTempKey) != ERROR_SUCCESS) { goto Cleanup; } Added: trunk/reactos/dll/cpl/input_new/key_sequence_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/key_sequ… ============================================================================== --- trunk/reactos/dll/cpl/input_new/key_sequence_dialog.c (added) +++ trunk/reactos/dll/cpl/input_new/key_sequence_dialog.c [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -0,0 +1,205 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/key_sequence_dialog.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input.h" + + +INT_PTR CALLBACK +ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + { + KEY_SETTINGS *keySettings = (KEY_SETTINGS*) lParam; + + if (keySettings != NULL) + { + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR) keySettings); + + if (keySettings->dwLanguage == 3) + { + CheckDlgButton(hwndDlg, IDC_CTRL_LANG, BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LANG), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LANG), FALSE); + } + else + { + CheckDlgButton(hwndDlg, IDC_SWITCH_INPUT_LANG_CB, BST_CHECKED); + + if (keySettings->dwLanguage == 1) + { + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LANG, BST_CHECKED); + } + else + { + CheckDlgButton(hwndDlg, IDC_CTRL_LANG, BST_CHECKED); + } + } + + if (keySettings->dwLayout == 3) + { + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LAYOUT, BST_CHECKED); + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LAYOUT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LAYOUT), FALSE); + } + else + { + CheckDlgButton(hwndDlg, IDC_SWITCH_KBLAYOUTS_CB, BST_CHECKED); + + if (keySettings->dwLayout == 1) + { + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LAYOUT, BST_CHECKED); + } + else + { + CheckDlgButton(hwndDlg, IDC_CTRL_LAYOUT, BST_CHECKED); + } + } + } + } + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_SWITCH_INPUT_LANG_CB: + { + if (HIWORD(wParam) == BN_CLICKED) + { + if (IsDlgButtonChecked(hwndDlg, IDC_SWITCH_INPUT_LANG_CB) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LANG), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LANG), TRUE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LANG), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LANG), FALSE); + } + } + } + break; + + case IDC_SWITCH_KBLAYOUTS_CB: + { + if (HIWORD(wParam) == BN_CLICKED) + { + if (IsDlgButtonChecked(hwndDlg, IDC_SWITCH_KBLAYOUTS_CB) == BST_CHECKED) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LAYOUT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LAYOUT), TRUE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_CTRL_LAYOUT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_LEFT_ALT_LAYOUT), FALSE); + } + } + } + break; + + case IDC_CTRL_LANG: + { + if (HIWORD(wParam) == BN_CLICKED) + { + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LAYOUT, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_CTRL_LAYOUT, BST_UNCHECKED); + } + } + break; + + case IDC_LEFT_ALT_LANG: + { + if (HIWORD(wParam) == BN_CLICKED) + { + CheckDlgButton(hwndDlg, IDC_CTRL_LAYOUT, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LAYOUT, BST_UNCHECKED); + } + } + break; + + case IDC_CTRL_LAYOUT: + { + if (HIWORD(wParam) == BN_CLICKED) + { + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LANG, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_CTRL_LANG, BST_UNCHECKED); + } + } + break; + + case IDC_LEFT_ALT_LAYOUT: + { + if (HIWORD(wParam) == BN_CLICKED) + { + CheckDlgButton(hwndDlg, IDC_CTRL_LANG, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_LEFT_ALT_LANG, BST_UNCHECKED); + } + } + break; + + case IDOK: + { + KEY_SETTINGS *keySettings; + + keySettings = (KEY_SETTINGS*)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + + if (keySettings != NULL) + { + if (IsDlgButtonChecked(hwndDlg, IDC_SWITCH_INPUT_LANG_CB) == BST_CHECKED) + { + if (IsDlgButtonChecked(hwndDlg, IDC_CTRL_LANG) == BST_CHECKED) + { + keySettings->dwLanguage = 2; + } + else + { + keySettings->dwLanguage = 1; + } + } + else + { + keySettings->dwLanguage = 3; + } + + if (IsDlgButtonChecked(hwndDlg, IDC_SWITCH_KBLAYOUTS_CB) == BST_CHECKED) + { + if (IsDlgButtonChecked(hwndDlg, IDC_CTRL_LAYOUT) == BST_CHECKED) + { + keySettings->dwLayout = 2; + } + else + { + keySettings->dwLayout = 1; + } + } + else + { + keySettings->dwLayout = 3; + } + } + + EndDialog(hwndDlg, LOWORD(wParam)); + } + break; + + case IDCANCEL: + { + EndDialog(hwndDlg, LOWORD(wParam)); + } + break; + } + } + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/input_new/key_sequence_dialog.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/input_new/key_settings_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/key_sett… ============================================================================== --- trunk/reactos/dll/cpl/input_new/key_settings_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/key_settings_dialog.c [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -7,9 +7,212 @@ #include "input.h" +static KEY_SETTINGS _KeySettings = { 0 }; + + +static VOID +ReadKeysSettings(VOID) +{ + HKEY hKey; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + DWORD dwSize; + + dwSize = sizeof(DWORD); + + if (RegQueryValueExW(hKey, + L"Attributes", + NULL, NULL, + (LPBYTE)&_KeySettings.dwAttributes, + &dwSize) != ERROR_SUCCESS) + { + _KeySettings.dwAttributes = (DWORD) -1; + } + + RegCloseKey(hKey); + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout\\Toggle", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + WCHAR szBuffer[MAX_PATH]; + DWORD dwSize; + + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hKey, + L"Language Hotkey", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + _KeySettings.dwLanguage = _wtoi(szBuffer); + } + + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hKey, + L"Layout Hotkey", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + _KeySettings.dwLayout = _wtoi(szBuffer); + } + + RegCloseKey(hKey); + } +} + + +static VOID +WriteKeysSettings(VOID) +{ + HKEY hKey; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout", + 0, + KEY_SET_VALUE, + &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, + L"Attributes", + 0, + REG_DWORD, + (LPBYTE)&_KeySettings.dwAttributes, + sizeof(DWORD)); + + RegCloseKey(hKey); + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout\\Toggle", + 0, + KEY_SET_VALUE, + &hKey) == ERROR_SUCCESS) + { + WCHAR szBuffer[MAX_PATH]; + + StringCchPrintfW(szBuffer, ARRAYSIZE(szBuffer), L"%lu", _KeySettings.dwLanguage); + + RegSetValueExW(hKey, + L"Hotkey", + 0, + REG_SZ, + (LPBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + + RegSetValueExW(hKey, + L"Language Hotkey", + 0, + REG_SZ, + (LPBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + + StringCchPrintfW(szBuffer, ARRAYSIZE(szBuffer), L"%lu", _KeySettings.dwLayout); + + RegSetValueExW(hKey, + L"Layout Hotkey", + 0, + REG_SZ, + (LPBYTE)szBuffer, + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + + /* Notice system of change of parameters */ + SystemParametersInfoW(SPI_SETLANGTOGGLE, 0, NULL, 0); + } +} + + +static VOID +UpdateKeySettingsListView(HWND hwndList) +{ + WCHAR szBuffer[MAX_STR_LEN]; + LV_ITEM item; + INT iItemIndex; + + ListView_DeleteAllItems(hwndList); + + memset(&item, 0, sizeof(LV_ITEM)); + + LoadStringW(hApplet, IDS_SWITCH_BET_INLANG, szBuffer, ARRAYSIZE(szBuffer)); + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + item.pszText = szBuffer; + item.iItem = 0; + + iItemIndex = ListView_InsertItem(hwndList, &item); + + if (_KeySettings.dwLanguage == 1) + { + LoadStringW(hApplet, IDS_LEFT_ALT_SHIFT, szBuffer, ARRAYSIZE(szBuffer)); + } + else if (_KeySettings.dwLanguage == 2) + { + LoadStringW(hApplet, IDS_CTRL_SHIFT, szBuffer, ARRAYSIZE(szBuffer)); + } + else + { + LoadStringW(hApplet, IDS_NONE, szBuffer, ARRAYSIZE(szBuffer)); + } + + ListView_SetItemText(hwndList, iItemIndex, 1, szBuffer); +} + + +static VOID +OnInitKeySettingsDialog(HWND hwndDlg) +{ + LV_COLUMN column; + HWND hwndList; + + ReadKeysSettings(); + + if (_KeySettings.dwAttributes & KLF_SHIFTLOCK) + { + CheckDlgButton(hwndDlg, IDC_PRESS_SHIFT_KEY_RB, BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_PRESS_CL_KEY_RB, BST_CHECKED); + } + else + { + CheckDlgButton(hwndDlg, IDC_PRESS_SHIFT_KEY_RB, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_PRESS_CL_KEY_RB, BST_UNCHECKED); + } + + hwndList = GetDlgItem(hwndDlg, IDC_KEY_LISTVIEW); + + ListView_SetExtendedListViewStyle(hwndList, LVS_EX_FULLROWSELECT); + + memset(&column, 0, sizeof(LV_COLUMN)); + + column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + + column.fmt = LVCFMT_LEFT; + column.iSubItem = 0; + column.pszText = L""; + column.cx = 210; + ListView_InsertColumn(hwndList, 0, &column); + + column.fmt = LVCFMT_RIGHT; + column.cx = 145; + column.iSubItem = 1; + column.pszText = L""; + ListView_InsertColumn(hwndList, 1, &column); + + UpdateKeySettingsListView(hwndList); +} + INT_PTR CALLBACK -ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +KeySettingsDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); @@ -17,7 +220,7 @@ { case WM_INITDIALOG: { - + OnInitKeySettingsDialog(hwndDlg); } break; @@ -25,8 +228,31 @@ { switch (LOWORD(wParam)) { + case IDC_CHANGE_KEY_SEQ_BTN: + { + if (DialogBoxParamW(hApplet, + MAKEINTRESOURCEW(IDD_CHANGE_KEY_SEQ), + hwndDlg, + ChangeKeySeqDialogProc, + (LPARAM)&_KeySettings) == IDOK) + { + UpdateKeySettingsListView(GetDlgItem(hwndDlg, IDC_KEY_LISTVIEW)); + } + } + break; + case IDOK: { + if (IsDlgButtonChecked(hwndDlg, IDC_PRESS_CL_KEY_RB) == BST_UNCHECKED) + { + _KeySettings.dwAttributes &= ~KLF_SHIFTLOCK; + } + else + { + _KeySettings.dwAttributes |= KLF_SHIFTLOCK; + } + + WriteKeysSettings(); EndDialog(hwndDlg, LOWORD(wParam)); } break; @@ -43,48 +269,3 @@ return FALSE; } - -INT_PTR CALLBACK -KeySettingsDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - - switch (uMsg) - { - case WM_INITDIALOG: - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_CHANGE_KEY_SEQ_BTN: - { - if (DialogBoxW(hApplet, - MAKEINTRESOURCEW(IDD_CHANGE_KEY_SEQ), - hwndDlg, - ChangeKeySeqDialogProc) == IDOK) - { - - } - } - break; - - case IDOK: - { - EndDialog(hwndDlg, LOWORD(wParam)); - } - break; - - case IDCANCEL: - { - EndDialog(hwndDlg, LOWORD(wParam)); - } - break; - } - } - break; - } - - return FALSE; -} Modified: trunk/reactos/dll/cpl/input_new/settings_page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/settings… ============================================================================== --- trunk/reactos/dll/cpl/input_new/settings_page.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/settings_page.c [iso-8859-1] Tue Aug 9 21:03:55 2016 @@ -348,13 +348,10 @@ case IDC_KEY_SET_BTN: { - if (DialogBoxW(hApplet, - MAKEINTRESOURCEW(IDD_KEYSETTINGS), - hwndDlg, - KeySettingsDialogProc) == IDOK) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } + DialogBoxW(hApplet, + MAKEINTRESOURCEW(IDD_KEYSETTINGS), + hwndDlg, + KeySettingsDialogProc); } break; } @@ -374,9 +371,28 @@ { if (header->idFrom == IDC_KEYLAYOUT_LIST) { - if (ListView_GetNextItem(header->hwndFrom, -1, LVNI_SELECTED) != -1) - { + INT iSelected = ListView_GetNextItem(header->hwndFrom, -1, LVNI_SELECTED); + + if (iSelected != -1) + { + LVITEM item = { 0 }; + SetControlsState(hwndDlg, TRUE); + + item.mask = LVIF_PARAM; + item.iItem = iSelected; + + if (ListView_GetItem(header->hwndFrom, &item) != FALSE) + { + INPUT_LIST_NODE *pInput; + + pInput = (INPUT_LIST_NODE*) item.lParam; + + if (pInput != NULL && pInput->wFlags & INPUT_LIST_NODE_FLAG_DEFAULT) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT), FALSE); + } + } } else { @@ -388,6 +404,7 @@ case PSN_APPLY: { + /* Write Input Methods list to registry */ InputList_Process(); } break;

8 years, 2 months

[pschweitzer] 72170: [KMTESTS:CC] It seems we're page-aligned. CORE-11003

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 9 20:52:38 2016 New Revision: 72170 URL: http://svn.reactos.org/svn/reactos?rev=72170&view=rev Log: [KMTESTS:CC] It seems we're page-aligned. CORE-11003 Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] Tue Aug 9 20:52:38 2016 @@ -228,8 +228,8 @@ if (!FlagOn(Irp->Flags, IRP_NOCACHE)) { - ok(Offset.QuadPart % 512 != 0, "Offset is aligned: %I64i\n", Offset.QuadPart); - ok(Length % 512 != 0, "Length is aligned: %I64i\n", Length); + ok(Offset.QuadPart % PAGE_SIZE != 0, "Offset is aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE != 0, "Length is aligned: %I64i\n", Length); Buffer = Irp->AssociatedIrp.SystemBuffer; ok(Buffer != NULL, "Null pointer!\n"); @@ -262,8 +262,8 @@ } else { - ok(Offset.QuadPart % 512 == 0, "Offset is not aligned: %I64i\n", Offset.QuadPart); - ok(Length % 512 == 0, "Length is not aligned: %I64i\n", Length); + ok(Offset.QuadPart % PAGE_SIZE == 0, "Offset is not aligned: %I64i\n", Offset.QuadPart); + ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); Buffer = MapAndLockUserBuffer(Irp, Length);

8 years, 2 months

[pschweitzer] 72169: [KMTESTS:CC] Modify a bit the read test so that it actually fails in ReactOS. It instructs us that when it comes to file boundaries, our Cc fails to properly align read (wherea...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Aug 9 20:46:00 2016 New Revision: 72169 URL: http://svn.reactos.org/svn/reactos?rev=72169&view=rev Log: [KMTESTS:CC] Modify a bit the read test so that it actually fails in ReactOS. It instructs us that when it comes to file boundaries, our Cc fails to properly align read (whereas it should!). This is the behavior exposed by the MS FastFAT. CORE-11003 CORE-11819 Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_drv.c [iso-8859-1] Tue Aug 9 20:46:00 2016 @@ -191,9 +191,9 @@ else if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR) && IoStack->FileObject->FileName.Buffer[1] == 'S') { - Fcb->Header.AllocationSize.QuadPart = 3000; - Fcb->Header.FileSize.QuadPart = 3000; - Fcb->Header.ValidDataLength.QuadPart = 3000; + Fcb->Header.AllocationSize.QuadPart = 1004; + Fcb->Header.FileSize.QuadPart = 1004; + Fcb->Header.ValidDataLength.QuadPart = 1004; } else { Modified: trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_cc/CcCopyRea… ============================================================================== --- trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_cc/CcCopyRead_user.c [iso-8859-1] Tue Aug 9 20:46:00 2016 @@ -64,6 +64,11 @@ ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_hex(((USHORT *)Buffer)[0], 0xBABA); + ByteOffset.QuadPart = 999990; + Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 10, &ByteOffset, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_hex(((USHORT *)Buffer)[0], 0xBABA); + ByteOffset.QuadPart = 1000; Status = NtReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, Buffer, 2, &ByteOffset, NULL); ok_eq_hex(Status, STATUS_SUCCESS);

8 years, 2 months

← Newer
1
...
33
34
35
36
37
38
39
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2016