Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[cgutman] 69727: [PCIX] - Fix typo in QueryInterface size field

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Oct 28 01:11:00 2015 New Revision: 69727 URL: http://svn.reactos.org/svn/reactos?rev=69727&view=rev Log: [PCIX] - Fix typo in QueryInterface size field Modified: trunk/reactos/drivers/bus/pcix/pci/config.c Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Wed Oct 28 01:11:00 2015 @@ -173,7 +173,7 @@ ASSERT(IoStackLocation->MajorFunction == IRP_MJ_PNP); IoStackLocation->MinorFunction = IRP_MN_QUERY_INTERFACE; IoStackLocation->Parameters.QueryInterface.InterfaceType = &GUID_PCI_BUS_INTERFACE_STANDARD; - IoStackLocation->Parameters.QueryInterface.Size = sizeof(GUID_PCI_BUS_INTERFACE_STANDARD); + IoStackLocation->Parameters.QueryInterface.Size = sizeof(PCI_BUS_INTERFACE_STANDARD); IoStackLocation->Parameters.QueryInterface.Version = PCI_BUS_INTERFACE_STANDARD_VERSION; IoStackLocation->Parameters.QueryInterface.Interface = (PINTERFACE)PciInterface; IoStackLocation->Parameters.QueryInterface.InterfaceSpecificData = NULL;

8 years, 10 months

[aandrejevic] 69726: [NTVDM] VGA Horizontal splitting should reset the address to 0 + panning, and not the start address + panning.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Oct 28 00:39:29 2015 New Revision: 69726 URL: http://svn.reactos.org/svn/reactos?rev=69726&view=rev Log: [NTVDM] VGA Horizontal splitting should reset the address to 0 + panning, and not the start address + panning. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Wed Oct 28 00:39:29 2015 @@ -1247,9 +1247,7 @@ } /* Reset the address, but assume the preset row scan is 0 */ - Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], - VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) - + BytePanning; + Address = BytePanning; } if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1))

8 years, 10 months

[aandrejevic] 69725: [NTVDM] Implement VGA horizontal splitting.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 27 22:16:53 2015 New Revision: 69725 URL: http://svn.reactos.org/svn/reactos?rev=69725&view=rev Log: [NTVDM] Implement VGA horizontal splitting. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Tue Oct 27 22:16:53 2015 @@ -1185,10 +1185,14 @@ DWORD AddressSize = VgaGetAddressSize(); DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; BYTE PresetRowScan = VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] & 0x1F; + BYTE BytePanning = (VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3; DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + PresetRowScan * ScanlineSize - + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); + + BytePanning; + WORD LineCompare = VgaCrtcRegisters[VGA_CRTC_LINE_COMPARE_REG] + | ((VgaCrtcRegisters[VGA_CRTC_OVERFLOW_REG] & VGA_CRTC_OVERFLOW_LC8) << 4); + BYTE PixelShift = VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F; /* * If the console framebuffer is NULL, that means something @@ -1216,9 +1220,38 @@ InterlaceHighBit >>= 1; } + if (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & VGA_CRTC_MAXSCANLINE_DOUBLE) + { + /* Halve the line compare value */ + LineCompare >>= 1; + } + else + { + /* Divide the line compare value by the maximum scan line */ + LineCompare /= 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + } + /* Loop through the scanlines */ for (i = 0; i < CurrResolution.Y; i++) { + if (i == LineCompare) + { + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_PPM) + { + /* + * Disable the pixel shift count and byte panning + * for the rest of the display cycle + */ + PixelShift = 0; + BytePanning = 0; + } + + /* Reset the address, but assume the preset row scan is 0 */ + Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]) + + BytePanning; + } + if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_OE) && (i & 1)) { /* Odd-numbered line in interlaced mode - set the high bit */ @@ -1233,11 +1266,11 @@ /* Apply horizontal pixel panning */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { - X = j + ((VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F) >> 1); + X = j + (PixelShift >> 1); } else { - X = j + (VgaAcRegisters[VGA_AC_HORZ_PANNING_REG] & 0x0F); + X = j + PixelShift; } /* Check the shifting mode */

8 years, 10 months

[hbelusca] 69724: Shut up Mr. GCC.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 27 21:27:55 2015 New Revision: 69724 URL: http://svn.reactos.org/svn/reactos?rev=69724&view=rev Log: Shut up Mr. GCC. Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] Tue Oct 27 21:27:55 2015 @@ -25,6 +25,7 @@ return TRUE; } +#if 0 static VOID CleanupUxTheme(VOID) { @@ -32,7 +33,7 @@ hUxTheme = NULL; // Initialized = FALSE; } - +#endif //////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] Tue Oct 27 21:27:55 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.h * PURPOSE: UX Theming helpers. * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */

8 years, 10 months

[hbelusca] 69723: [MSCONFIG_NEW] Enable Win7-like theming when applicable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 27 21:22:17 2015 New Revision: 69723 URL: http://svn.reactos.org/svn/reactos?rev=69723&view=rev Log: [MSCONFIG_NEW] Enable Win7-like theming when applicable. Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c (with props) trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h (with props) Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/msconfig_new/toolspage.cpp Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -11,6 +11,7 @@ list(APPEND C_SOURCE comctl32ex/listviewfuncs.c + comctl32ex/uxthemesupp.c fileextractdialog.c fileutils.c freeldrpage.c Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * PURPOSE: UX Theming helpers. + * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" +#include "uxthemesupp.h" + +static HMODULE hUxTheme = NULL; + +static BOOL +InitUxTheme(VOID) +{ + static BOOL Initialized = FALSE; + + if (Initialized) return TRUE; + + hUxTheme = LoadLibraryW(L"uxtheme.dll"); + if (hUxTheme == NULL) return FALSE; + + Initialized = TRUE; + return TRUE; +} + +static VOID +CleanupUxTheme(VOID) +{ + FreeLibrary(hUxTheme); + hUxTheme = NULL; + // Initialized = FALSE; +} + + + +//////////////////////////////////////////////////////////////////////////////// +// Taken from WinSpy++ 1.7 +// http://www.catch22.net/software/winspy +// Copyright (c) 2002 by J Brown +// + +typedef HRESULT (WINAPI* ETDTProc)(HWND, DWORD); + +HRESULT +WINAPI +EnableThemeDialogTexture(_In_ HWND hwnd, + _In_ DWORD dwFlags) +{ + ETDTProc fnEnableThemeDialogTexture; + + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); + if (!fnEnableThemeDialogTexture) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnEnableThemeDialogTexture(hwnd, dwFlags); +} + + +typedef HRESULT (WINAPI* SWTProc)(HWND, LPCWSTR, LPCWSTR); + +HRESULT +WINAPI +SetWindowTheme(_In_ HWND hwnd, + _In_ LPCWSTR pszSubAppName, + _In_ LPCWSTR pszSubIdList) +{ + SWTProc fnSetWindowTheme; + + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + fnSetWindowTheme = + (SWTProc)GetProcAddress(hUxTheme, "SetWindowTheme"); + if (!fnSetWindowTheme) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnSetWindowTheme(hwnd, pszSubAppName, pszSubIdList); +} Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -0,0 +1,48 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/comctl32ex/uxthemesupp.c + * PURPOSE: UX Theming helpers. + * COPYRIGHT: Copyright 2015 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef _UXTHEMESUPP_H_ +#define _UXTHEMESUPP_H_ + +#pragma once + +#if defined(_UXTHEME_H) || defined(_UXTHEME_H_) // First one is our headers from Wine/MinGW, second one is MS PSDK +#warning "PSDK header uxtheme.h is already included, you might think about using it instead!" +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +// +// Copied from uxtheme.h +// If you have this new header, then delete these and +// #include <uxtheme.h> instead! +// + +#define ETDT_DISABLE 0x00000001 +#define ETDT_ENABLE 0x00000002 +#define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) + +HRESULT +WINAPI +EnableThemeDialogTexture(_In_ HWND hwnd, + _In_ DWORD dwFlags); + +HRESULT +WINAPI +SetWindowTheme(_In_ HWND hwnd, + _In_ LPCWSTR pszSubAppName, + _In_ LPCWSTR pszSubIdList); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _UXTHEMESUPP_H_ Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -45,61 +45,6 @@ HICON hIcon = NULL; WNDPROC wpOrigEditProc = NULL; - -//////////////////////////////////////////////////////////////////////////////// -// Taken from WinSpy++ 1.7 -// http://www.catch22.net/software/winspy -// Copyright (c) 2002 by J Brown -// - -// -// Copied from uxtheme.h -// If you have this new header, then delete these and -// #include <uxtheme.h> instead! -// -#define ETDT_DISABLE 0x00000001 -#define ETDT_ENABLE 0x00000002 -#define ETDT_USETABTEXTURE 0x00000004 -#define ETDT_ENABLETAB (ETDT_ENABLE | ETDT_USETABTEXTURE) - -// -typedef HRESULT (WINAPI * ETDTProc) (HWND, DWORD); - -// -// Try to call EnableThemeDialogTexture, if uxtheme.dll is present -// -BOOL EnableDialogTheme(HWND hwnd) -{ - HMODULE hUXTheme; - ETDTProc fnEnableThemeDialogTexture; - - hUXTheme = LoadLibrary(_T("uxtheme.dll")); - - if(hUXTheme) - { - fnEnableThemeDialogTexture = - (ETDTProc)GetProcAddress(hUXTheme, "EnableThemeDialogTexture"); - - if(fnEnableThemeDialogTexture) - { - fnEnableThemeDialogTexture(hwnd, ETDT_ENABLETAB); - - FreeLibrary(hUXTheme); - return TRUE; - } - else - { - // Failed to locate API! - FreeLibrary(hUXTheme); - return FALSE; - } - } - else - { - // Not running under XP? Just fail gracefully - return FALSE; - } -} /* About Box dialog */ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -10,10 +10,11 @@ #include "precomp.h" #include "utils.h" -#include "listviewfuncs.h" #include "regutils.h" #include "stringutils.h" // #include "CmdLineParser.h" +#include "listviewfuncs.h" +#include "uxthemesupp.h" #include <winsvc.h> @@ -666,7 +667,7 @@ // DWORD dwStyle = ListView_GetExtendedListViewStyle(hServicesListCtrl); ListView_SetExtendedListViewStyle(hServicesListCtrl, dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES); - /** SetWindowTheme(hServicesListCtrl, _T("Explorer"), NULL); // TODO: activate this only if Windows >= XP **/ + SetWindowTheme(hServicesListCtrl, L"Explorer", NULL); // // Initialize the application page's controls. Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] Tue Oct 27 21:22:17 2015 @@ -11,6 +11,7 @@ #include "xmldomparser.hpp" #include "utils.h" #include "listviewfuncs.h" +#include "uxthemesupp.h" static HWND hToolsPage = NULL; static HWND hToolsListCtrl = NULL; @@ -330,7 +331,7 @@ // DWORD dwStyle = ListView_GetExtendedListViewStyle(hToolsListCtrl); ListView_SetExtendedListViewStyle(hToolsListCtrl, dwStyle | LVS_EX_FULLROWSELECT); - /** SetWindowTheme(hToolsListCtrl, _T("Explorer"), NULL); // TODO: activate this only if Windows >= XP **/ + SetWindowTheme(hToolsListCtrl, L"Explorer", NULL); // // Initialize the application page's controls.

8 years, 10 months

[tfaber] 69722: [KMTESTS:IO] - Add some basic parameter tests for IoSetDeviceInterfaceState CORE-9456

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 27 12:14:10 2015 New Revision: 69722 URL: http://svn.reactos.org/svn/reactos?rev=69722&view=rev Log: [KMTESTS:IO] - Add some basic parameter tests for IoSetDeviceInterfaceState CORE-9456 Modified: trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c Modified: trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoDeviceI… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Tue Oct 27 12:14:10 2015 @@ -181,9 +181,112 @@ } } +static +VOID +Test_IoSetDeviceInterface(VOID) +{ + NTSTATUS Status; + UNICODE_STRING SymbolicLinkName; + PWCHAR Buffer; + ULONG BufferSize; + + /* Invalid prefix or GUID */ + KmtStartSeh() + Status = IoSetDeviceInterfaceState(NULL, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitEmptyUnicodeString(&SymbolicLinkName, NULL, 0); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + + /* Valid prefix & GUID, invalid device node */ + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\\\?\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\X{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}\\"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + /* Must not read past the buffer */ + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + BufferSize = SymbolicLinkName.Length; + Buffer = KmtAllocateGuarded(BufferSize); + if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) + { + RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); + SymbolicLinkName.Buffer = Buffer; + SymbolicLinkName.MaximumLength = BufferSize; + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_OBJECT_NAME_NOT_FOUND); + KmtFreeGuarded(Buffer); + } + + RtlInitUnicodeString(&SymbolicLinkName, L"\\??\\#aaaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}"); + BufferSize = SymbolicLinkName.Length; + Buffer = KmtAllocateGuarded(BufferSize); + if (!skip(Buffer != NULL, "Failed to allocate %lu bytes\n", BufferSize)) + { + RtlCopyMemory(Buffer, SymbolicLinkName.Buffer, BufferSize); + SymbolicLinkName.Buffer = Buffer; + SymbolicLinkName.MaximumLength = BufferSize; + KmtStartSeh() + Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE); + KmtEndSeh(STATUS_SUCCESS) + ok_eq_hex(Status, STATUS_INVALID_PARAMETER); + KmtFreeGuarded(Buffer); + } +} + START_TEST(IoDeviceInterface) { // FIXME: This test crashes in Windows (void)Test_IoRegisterDeviceInterface; Test_IoRegisterPlugPlayNotification(); + Test_IoSetDeviceInterface(); }

8 years, 10 months

[spetreolle] 69721: [RAPPS] AC97: Fix Russian and other languages. CORE-10203

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Oct 27 00:34:07 2015 New Revision: 69721 URL: http://svn.reactos.org/svn/reactos?rev=69721&view=rev Log: [RAPPS] AC97: Fix Russian and other languages. CORE-10203 Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtual… ============================================================================== --- trunk/reactos/media/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ac97forvirtualbox.txt [iso-8859-1] Tue Oct 27 00:34:07 2015 @@ -14,8 +14,8 @@ CDPath = none [Section.0405] -Name = Ovladac AC97 pro VirtualBox -License = NeznÃ¡mÃ¡ +Name = OvladaÄ AC97 pro VirtualBox +Licence = NeznÃ¡mÃ¡ Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. [Section.0407] @@ -51,19 +51,19 @@ [Section.0415] Name = Sterownik AC97 dla VirtualBox -License = Nieznana -Description = Rozpakuj zawartosc w folderze "ReactOS" i dwukrotnie zrestartuj system. +Licence = Nieznana +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. [Section.0418] -Name = ModÃºl-pilot AC97 pentru VirtualBox -License = NespecificatÄ +Name = Modul pilot AC97 pentru VirtualBox +Licence = NespecificatÄ Description = DezarhivaÈi Ã®n dosarul ReactOS apoi reporniÈi ReactOS de douÄ ori. Size = 185,5 ko [Section.0419] -Name = ??????? AC97 ??? VirtualBox -License = ?? ??????? -Description = P????????????? ?????????? ? ????? "ReactOS", ????? ?????? ????????????? ???????. +Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox +Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ +Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.041f] Name = VirtualBox iÃ§in AC'97 SÃ¼rÃ¼cÃ¼sÃ¼ @@ -72,12 +72,12 @@ Size = 185,5 KB [Section.0422] -Name = ??????? AC97 ??? VirtualBox -License = ???????? -Description = P??????????? ????? ? ???? "ReactOS" ????? ???? ????? ?????????????? ???????. +Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox +Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° +Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.0804] -Description = AC'97 ?????????????????????????????? +Description = AC'97 å¼å®¹è®¾å¤çé³é¢é©±å¨ç¨åºãå¨çµèæä»¶å¤¹ä¸è§£åç¼©å¹¶éæ°å¯å¨ä¸¤æ¬¡ã [Section.0813] Name = AC97 Driver voor VirtualBox

8 years, 10 months

[hbelusca] 69720: [MSCONFIG_NEW]: Fix header (and build).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 26 23:24:19 2015 New Revision: 69720 URL: http://svn.reactos.org/svn/reactos?rev=69720&view=rev Log: [MSCONFIG_NEW]: Fix header (and build). Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/freeldrpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/freeldrpage.c [iso-8859-1] Mon Oct 26 23:24:19 2015 @@ -12,7 +12,7 @@ #include <share.h> #include <wingdi.h> -#include <WindowsX.h> +#include "commctrldefs.h" #include "utils.h"

8 years, 10 months

[hbelusca] 69719: [SERVMAN] - Explicitely use UNICODE versions of OpenSCManager and OpenService. - When OpenSCManager or OpenService fail, they return a NULL handle (not INVALID_HANDLE_VALUE).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 26 23:15:40 2015 New Revision: 69719 URL: http://svn.reactos.org/svn/reactos?rev=69719&view=rev Log: [SERVMAN] - Explicitely use UNICODE versions of OpenSCManager and OpenService. - When OpenSCManager or OpenService fail, they return a NULL handle (not INVALID_HANDLE_VALUE). Modified: trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/query.c Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Mon Oct 26 23:15:40 2015 @@ -17,14 +17,14 @@ SC_HANDLE hSc; BOOL bRet = FALSE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (hSCManager) { - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - DELETE); + hSc = OpenServiceW(hSCManager, + Info->pCurrentService->lpServiceName, + DELETE); if (hSc) { if (DeleteService(hSc)) Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Mon Oct 26 23:15:40 2015 @@ -17,14 +17,14 @@ DWORD dwBytesNeeded, dwCount; BOOL bRet = FALSE; - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ALL_ACCESS); if (hSCManager) { - hService = OpenService(hSCManager, - lpServiceName, - SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); + hService = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); if (hService) { /* Does this have any dependencies? */ Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Mon Oct 26 23:15:40 2015 @@ -273,10 +273,10 @@ Info->pAllServices = NULL; } - ScHandle = OpenSCManager(NULL, - NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (ScHandle != INVALID_HANDLE_VALUE) + ScHandle = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (ScHandle != NULL) { if (!EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, @@ -336,16 +336,16 @@ SC_HANDLE hScm; BOOL bRet = FALSE; - hScm = OpenSCManager(NULL, - NULL, - SC_MANAGER_ENUMERATE_SERVICE); - if (hScm != INVALID_HANDLE_VALUE) + hScm = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hScm != NULL) { SC_HANDLE hService; - hService = OpenService(hScm, - pService->lpServiceName, - SERVICE_QUERY_STATUS); + hService = OpenServiceW(hScm, + pService->lpServiceName, + SERVICE_QUERY_STATUS); if (hService) { DWORD size;

8 years, 10 months

[hbelusca] 69718: Add msconfig_new in the list of compiled modules, for people to test it.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 26 23:04:37 2015 New Revision: 69718 URL: http://svn.reactos.org/svn/reactos?rev=69718&view=rev Log: Add msconfig_new in the list of compiled modules, for people to test it. Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Mon Oct 26 23:04:37 2015 @@ -18,6 +18,7 @@ add_subdirectory(mmc) add_subdirectory(mplay32) add_subdirectory(msconfig) +add_subdirectory(msconfig_new) add_subdirectory(mscutils) add_subdirectory(mspaint) add_subdirectory(mstsc)

8 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
35
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 October 2015