Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[gadamopoulos] 66863: [WINLOGON] - Create the window station handle and the desktops with MAXIMUM_ALLOWED access rights. - Call AddAceToWindowStation before calling SetWindowStationUser.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 23 07:46:17 2015 New Revision: 66863 URL: http://svn.reactos.org/svn/reactos?rev=66863&view=rev Log: [WINLOGON] - Create the window station handle and the desktops with MAXIMUM_ALLOWED access rights. - Call AddAceToWindowStation before calling SetWindowStationUser. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Mar 23 07:46:17 2015 @@ -1007,6 +1007,11 @@ DWORD WINAPI SetWindowStationUser(HWINSTA hWinSta, LUID* pluid, PSID psid, DWORD sidSize); +BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid); + static BOOL AllowWinstaAccess(PWLSESSION Session) { @@ -1068,6 +1073,8 @@ WARN("Couldn't get Authentication id from user token!\n"); goto Cleanup; } + + AddAceToWindowStation(Session->InteractiveWindowStation, psid); ret = SetWindowStationUser(Session->InteractiveWindowStation, &Stats.AuthenticationId, Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Mon Mar 23 07:46:17 2015 @@ -1235,7 +1235,7 @@ Session->InteractiveWindowStation = CreateWindowStationW( Session->InteractiveWindowStationName, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if (!Session->InteractiveWindowStation) { @@ -1256,7 +1256,7 @@ NULL, NULL, 0, /* FIXME: Add DF_ALLOWOTHERACCOUNTHOOK flag? */ - GENERIC_ALL, + MAXIMUM_ALLOWED, &UserDesktopSecurity); if (!Session->ApplicationDesktop) { @@ -1272,7 +1272,7 @@ NULL, NULL, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if (!Session->WinlogonDesktop) { @@ -1288,7 +1288,7 @@ NULL, NULL, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if(!Session->ScreenSaverDesktop) {

9 years, 9 months

[ekohl] 66862: [SCHEDSVC] Start work on the seceduler service. [NETAPI32] Implement the scheduler service client functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 22 21:57:55 2015 New Revision: 66862 URL: http://svn.reactos.org/svn/reactos?rev=66862&view=rev Log: [SCHEDSVC] Start work on the seceduler service. [NETAPI32] Implement the scheduler service client functions. Added: trunk/reactos/base/services/schedsvc/ (with props) trunk/reactos/base/services/schedsvc/CMakeLists.txt (with props) trunk/reactos/base/services/schedsvc/precomp.h (with props) trunk/reactos/base/services/schedsvc/rpcserver.c (with props) trunk/reactos/base/services/schedsvc/schedsvc.c (with props) trunk/reactos/base/services/schedsvc/schedsvc.rc (with props) trunk/reactos/base/services/schedsvc/schedsvc.spec (with props) trunk/reactos/dll/win32/netapi32/schedule.c (with props) trunk/reactos/include/reactos/idl/atsvc.acf (with props) trunk/reactos/include/reactos/idl/atsvc.idl (with props) Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -2,6 +2,7 @@ add_subdirectory(audiosrv) add_subdirectory(eventlog) add_subdirectory(rpcss) +add_subdirectory(schedsvc) add_subdirectory(spoolsv) add_subdirectory(svchost) add_subdirectory(tcpsvcs) Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 22 21:57:55 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/schedsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/CMa… ============================================================================== --- trunk/reactos/base/services/schedsvc/CMakeLists.txt (added) +++ trunk/reactos/base/services/schedsvc/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl) +spec2def(schedsvc.dll schedsvc.spec ADD_IMPORTLIB) + +add_library(schedsvc SHARED + rpcserver.c + schedsvc.c + schedsvc.rc + ${CMAKE_CURRENT_BINARY_DIR}/atsvc_s.c + ${CMAKE_CURRENT_BINARY_DIR}/schedsvc.def) + +set_module_type(schedsvc win32dll UNICODE) +target_link_libraries(schedsvc wine) +add_importlibs(schedsvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_cd_file(TARGET schedsvc DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/services/schedsvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h (added) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,22 @@ +#ifndef _SCHEDSVC_PCH_ +#define _SCHEDSVC_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <atsvc_s.h> + +#include <wine/debug.h> + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter); + +#endif /* _SCHEDSVC_PCH_ */ Propchange: trunk/reactos/base/services/schedsvc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c (added) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,129 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/schedsvc/rpcserver.c + * PURPOSE: Scheduler service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "lmerr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\atsvc", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(atsvc_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +/* Function 0 */ +NET_API_STATUS +WINAPI +NetrJobAdd( + ATSVC_HANDLE ServerName, + LPAT_INFO pAtInfo, + LPDWORD pJobId) +{ + return ERROR_SUCCESS; +} + + +/* Function 1 */ +NET_API_STATUS +WINAPI +NetrJobDel( + ATSVC_HANDLE ServerName, + DWORD MinJobId, + DWORD MaxJobId) +{ + return ERROR_SUCCESS; +} + + +/* Function 2 */ +NET_API_STATUS +__stdcall +NetrJobEnum( + ATSVC_HANDLE ServerName, + LPAT_ENUM_CONTAINER pEnumContainer, + DWORD PreferedMaximumLength, + LPDWORD pTotalEntries, + LPDWORD pResumeHandle) +{ + return ERROR_SUCCESS; +} + + +/* Function 3 */ +NET_API_STATUS +WINAPI +NetrJobGetInfo( + ATSVC_HANDLE ServerName, + DWORD JobId, + LPAT_INFO *ppAtInfo) +{ + return ERROR_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/base/services/schedsvc/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.c (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,183 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/schedsvc/schedsvc.c + * PURPOSE: Scheduling service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"Schedule"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static +DWORD +ServiceInit(VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +VOID WINAPI +SchedServiceMain(DWORD argc, LPTSTR *argv) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("SchedServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/services/schedsvc/schedsvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.rc (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.rc [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Scheduler Service" +#define REACTOS_STR_INTERNAL_NAME "schedsvc" +#define REACTOS_STR_ORIGINAL_FILENAME "schedsvc.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/schedsvc/schedsvc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.spec (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.spec [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1 @@ +@ stdcall SchedServiceMain(long ptr) Propchange: trunk/reactos/base/services/schedsvc/schedsvc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -1609,7 +1609,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","winmgmt" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","Schedule","winmgmt" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -1252,6 +1252,7 @@ "PNP_TDI", \ "TDI", \ "PlugPlay", \ + "SchedulerGroup", \ "SpoolerGroup", \ "UIGroup", \ "Extended Base" @@ -1897,6 +1898,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 +; Scheduler service +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DisplayName",0x00000000,"Scheduler service" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Group",0x00000000,"SchedulerGroup" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\schedsvc.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceMain",0x00000000,"SchedServiceMain" + ; Spooler service HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DisplayName",0x00000000,"Printer Spooler" Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -6,6 +6,7 @@ add_definitions(-D__WINESRC__) spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB) add_rpc_files(client + ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/dssetup.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) @@ -23,11 +24,13 @@ nbt.c netapi32.c netbios.c + schedule.c share.c user.c wksta.c wksta_new.c netapi32.h + ${CMAKE_CURRENT_BINARY_DIR}/atsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/dssetup_c.c ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -201,25 +201,3 @@ return ApiStatus; } - -NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD jobid) -{ - FIXME("stub (%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); - return NERR_Success; -} - -NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) -{ - FIXME("stub (%s, %d, %d)\n", debugstr_w(server), minjobid, maxjobid); - return NERR_Success; -} - -NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, - LPDWORD totalentries, LPDWORD resumehandle) -{ - FIXME("stub (%s, %p, %d, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); - *entriesread = 0; - *totalentries = 0; - return NERR_Success; -} - Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -204,7 +204,7 @@ @ stdcall NetScheduleJobAdd(wstr ptr ptr) @ stdcall NetScheduleJobDel(wstr long long) @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) -@ stub NetScheduleJobGetInfo +@ stdcall NetScheduleJobGetInfo(wstr long ptr) @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel @ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) Added: trunk/reactos/dll/win32/netapi32/schedule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/schedul… ============================================================================== --- trunk/reactos/dll/win32/netapi32/schedule.c (added) +++ trunk/reactos/dll/win32/netapi32/schedule.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,199 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/schedule.c + * PURPOSE: Scheduler service interface code + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" +#include "atsvc_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +handle_t __RPC_USER +ATSVC_HANDLE_bind(ATSVC_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("ATSVC_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (RPC_WSTR)pszSystemName, + L"\\pipe\\atsvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +ATSVC_HANDLE_unbind(ATSVC_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("ATSVC_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NET_API_STATUS +WINAPI +NetScheduleJobAdd( + LPCWSTR ServerName, + LPBYTE Buffer, + LPDWORD JobId) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobAdd(%s, %p, %p)\n", debugstr_w(ServerName), + Buffer, JobId); + + RpcTryExcept + { + status = NetrJobAdd(ServerName, + (LPAT_INFO)Buffer, + JobId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobDel( + LPCWSTR ServerName, + DWORD MinJobId, + DWORD MaxJobId) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobDel(%s, %d, %d)\n", debugstr_w(ServerName), + MinJobId, MaxJobId); + + RpcTryExcept + { + status = NetrJobDel(ServerName, + MinJobId, + MaxJobId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobEnum( + LPCWSTR ServerName, + LPBYTE *PointerToBuffer, + DWORD PreferredMaximumLength, + LPDWORD EntriesRead, + LPDWORD TotalEntries, + LPDWORD ResumeHandle) +{ + AT_ENUM_CONTAINER EnumContainer; + NET_API_STATUS status; + + TRACE("NetScheduleJobEnum(%s, %p, %d, %p, %p, %p)\n", debugstr_w(ServerName), + PointerToBuffer, PreferredMaximumLength, EntriesRead, TotalEntries, ResumeHandle); + + EnumContainer.EntriesRead = 0; + EnumContainer.Buffer = NULL; + + RpcTryExcept + { + status = NetrJobEnum(ServerName, + &EnumContainer, + PreferredMaximumLength, + TotalEntries, + ResumeHandle); + if (status == NERR_Success || status == ERROR_MORE_DATA) + { + *PointerToBuffer = (LPBYTE)EnumContainer.Buffer; + *EntriesRead = EnumContainer.EntriesRead; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobGetInfo( + LPCWSTR ServerName, + DWORD JobId, + LPBYTE *PointerToBuffer) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobGetInfo(%s, %d, %p)\n", debugstr_w(ServerName), + JobId, PointerToBuffer); + + RpcTryExcept + { + status = NetrJobGetInfo(ServerName, + JobId, + (LPAT_INFO *)PointerToBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/schedule.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/atsvc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/atsvc.… ============================================================================== --- trunk/reactos/include/reactos/idl/atsvc.acf (added) +++ trunk/reactos/include/reactos/idl/atsvc.acf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface atsvc +{ +} Propchange: trunk/reactos/include/reactos/idl/atsvc.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/atsvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/atsvc.… ============================================================================== --- trunk/reactos/include/reactos/idl/atsvc.idl (added) +++ trunk/reactos/include/reactos/idl/atsvc.idl [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,81 @@ +/* + * Scheduler Service interface definition + */ + +#include <ms-dtyp.idl> + +typedef [handle] const wchar_t *ATSVC_HANDLE; + +typedef struct _AT_ENUM +{ + DWORD JobId; + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + wchar_t *Command; +} AT_ENUM, *PAT_ENUM, *LPAT_ENUM; + +typedef struct _AT_INFO +{ + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + [string] wchar_t *Command; +} AT_INFO, *PAT_INFO, *LPAT_INFO; + +typedef struct _AT_ENUM_CONTAINER +{ + DWORD EntriesRead; + [size_is( EntriesRead)] LPAT_ENUM Buffer; +} AT_ENUM_CONTAINER, *PAT_ENUM_CONTAINER, *LPAT_ENUM_CONTAINER; + +[ + uuid(1FF70682-0A51-30E8-076D-740BE8CEE98B), + version(1.0), +#ifdef __midl + ms_union, +#endif + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\atsvc]") +#ifndef __midl + ,explicit_handle +#endif +] +interface atsvc +{ + /* Function 0 */ + NET_API_STATUS + __stdcall + NetrJobAdd( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] LPAT_INFO pAtInfo, + [out] LPDWORD pJobId); + + /* Function 1 */ + NET_API_STATUS + __stdcall + NetrJobDel( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] DWORD MinJobId, + [in] DWORD MaxJobId); + + /* Function 2 */ + NET_API_STATUS + __stdcall + NetrJobEnum( + [in, string, unique] ATSVC_HANDLE ServerName, + [in,out] LPAT_ENUM_CONTAINER pEnumContainer, + [in] DWORD PreferedMaximumLength, + [out] LPDWORD pTotalEntries, + [in, out, unique] LPDWORD pResumeHandle); + + /* Function 3 */ + NET_API_STATUS + __stdcall + NetrJobGetInfo( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] DWORD JobId, + [out] LPAT_INFO *ppAtInfo); +} Propchange: trunk/reactos/include/reactos/idl/atsvc.idl ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[gadamopoulos] 66861: - Fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 22 21:37:02 2015 New Revision: 66861 URL: http://svn.reactos.org/svn/reactos?rev=66861&view=rev Log: - Fix build Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sun Mar 22 21:37:02 2015 @@ -165,6 +165,7 @@ LPARAM lParam, PBSMINFO pBSMInfo); BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl); +HWND WINAPI SetTaskmanWindow(HWND); HWND WINAPI GetTaskmanWindow(VOID); HWND WINAPI GetProgmanWindow(VOID); BOOL WINAPI SetShellWindow(HWND);

9 years, 9 months

[gadamopoulos] 66860: [SHELL32] - Call SetTaskmanWindow right before RegisterShellHookWindow like the old explorer did.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 22 21:34:08 2015 New Revision: 66860 URL: http://svn.reactos.org/svn/reactos?rev=66860&view=rev Log: [SHELL32] - Call SetTaskmanWindow right before RegisterShellHookWindow like the old explorer did. Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Mar 22 21:34:08 2015 @@ -310,9 +310,14 @@ DWORD dwType) { if (dwType == 3) + { + SetTaskmanWindow(hWnd); return RegisterShellHookWindow(hWnd); + } else if (dwType == 0) + { return DeregisterShellHookWindow(hWnd); + } ERR("Unsupported argument"); return FALSE;

9 years, 9 months

[spetreolle] 66859: [IPHLPAPI] Add checks for the family.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 22 20:35:21 2015 New Revision: 66859 URL: http://svn.reactos.org/svn/reactos?rev=66859&view=rev Log: [IPHLPAPI] Add checks for the family. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Sun Mar 22 20:35:21 2015 @@ -290,15 +290,24 @@ if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - if ((Family == AF_INET6) || (Family == AF_UNSPEC)) - { - /* One day maybe... */ - FIXME("IPv6 is not supported in ReactOS!\n"); - if (Family == AF_INET6) - { + switch(Family) + { + case AF_INET: + break; + case AF_INET6: + /* One day maybe... */ + FIXME("IPv6 is not supported in ReactOS!\n"); /* We got nothing to say in this case */ return ERROR_NO_DATA; - } + break; + case AF_UNSPEC: + WARN("IPv6 addresses ignored, IPv4 only\n"); + Family = AF_INET; + break; + default: + ERR("Invalid family 0x%x\n", Family); + return ERROR_INVALID_PARAMETER; + break; } RemainingSize = *pOutBufLen;

9 years, 9 months

[akhaldi] 66858: [FUSION_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 22 18:34:09 2015 New Revision: 66858 URL: http://svn.reactos.org/svn/reactos?rev=66858&view=rev Log: [FUSION_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/fusion/asmcache.c trunk/rostests/winetests/fusion/asmname.c trunk/rostests/winetests/fusion/fusion.c Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… ============================================================================== --- trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -889,6 +889,43 @@ IAssemblyCache_Release(cache); } +static void test_CreateAssemblyCacheItem(void) +{ + IAssemblyCache *cache; + IAssemblyCacheItem *item; + HRESULT hr; + + static const WCHAR wine[] = {'w','i','n','e',0}; + + hr = pCreateAssemblyCache(&cache, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, wine); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + IAssemblyCache_Release(cache); +} + static void test_InstallAssembly(void) { IAssemblyCache *cache; @@ -1243,8 +1280,7 @@ "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1266,8 +1302,7 @@ "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), "Assembly path was changed\n"); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1329,7 +1364,7 @@ lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* short buffer, QUERYASMINFO_FLAG_GETSIZE */ @@ -1339,7 +1374,7 @@ lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* display name is "wine, Version=1.0.0.00000" */ @@ -1533,8 +1568,7 @@ lstrcatW(name, commasep); lstrcatW(name, ver); hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, @@ -1561,6 +1595,7 @@ return; test_CreateAssemblyCache(); + test_CreateAssemblyCacheItem(); test_InstallAssembly(); test_QueryAssemblyInfo(); } Modified: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… ============================================================================== --- trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -434,7 +434,7 @@ str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 0, "Expected 0, got %d\n", size); hi = 0xbeefcace; @@ -470,7 +470,7 @@ str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 1, "Expected 1, got %d\n", size); hi = 0xbeefcace; Modified: trunk/rostests/winetests/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.c… ============================================================================== --- trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -108,16 +108,14 @@ /* NULL pwzCachePath, pcchPath is 0 */ size = 0; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); /* NULL pwszCachePath, pcchPath is MAX_PATH */ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); @@ -142,8 +140,7 @@ lstrcpyW(path, nochange); size = lstrlenW(cachepath); hr = pGetCachePath(ASM_CACHE_GAC, path, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir);

9 years, 9 months

[akhaldi] 66857: [GDIPLUS] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 22 18:33:30 2015 New Revision: 66857 URL: http://svn.reactos.org/svn/reactos?rev=66857&view=rev Log: [GDIPLUS] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -823,6 +823,10 @@ right = bitmap->width-1; if (bottom >= bitmap->height) bottom = bitmap->height-1; + if (bottom < top || right < left) + /* entirely outside image, just sample a pixel so we don't have to + * special-case this later */ + left = top = right = bottom = 0; } else { @@ -1775,7 +1779,7 @@ for(i = 1; i < count; i++){ if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){ if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier) - || !(types[i + 1] & PathPointTypeBezier)){ + || !(types[i + 2] & PathPointTypeBezier)){ ERR("Bad bezier points\n"); goto end; } @@ -2021,8 +2025,7 @@ rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - if (graphics->hdc && - (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + if (graphics->hdc) { POINT points[2]; Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -565,8 +565,8 @@ } #define convert_indexed_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE index; \ ARGB argb; \ BYTE *color = (BYTE *)&argb; \ @@ -578,8 +578,8 @@ } while (0); #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x); \ @@ -588,8 +588,8 @@ } while (0); #define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ @@ -1466,6 +1466,18 @@ return stat; } +static inline DWORD blend_argb_no_bkgnd_alpha(DWORD src, DWORD bkgnd) +{ + BYTE b = (BYTE)src; + BYTE g = (BYTE)(src >> 8); + BYTE r = (BYTE)(src >> 16); + DWORD alpha = (BYTE)(src >> 24); + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | + (g + ((BYTE)(bkgnd >> 8) * (255 - alpha) + 127) / 255) << 8 | + (r + ((BYTE)(bkgnd >> 16) * (255 - alpha) + 127) / 255) << 16 | + (alpha << 24)); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { @@ -1506,6 +1518,17 @@ if (stat == Ok) stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + + if (stat == Ok && (background & 0xffffff)) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } + } } else stat = GenericError; @@ -3836,11 +3859,6 @@ * Encoding functions - * These functions encode an image in different image file formats. */ -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 static GpStatus encode_image_WIC(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Google (Lei Zhang) + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,6 +64,28 @@ #define FLAGS_NOFLAGS 0x0 #define FLAGS_INTPATH 0x4000 + +struct memory_buffer +{ + const BYTE *buffer; + INT size, pos; +}; + +struct region_header +{ + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; +}; + +struct path_header +{ + DWORD size; + DWORD magic; + DWORD count; + DWORD flags; +}; /* Header size as far as header->size is concerned. This doesn't include * header->size or header->checksum @@ -510,12 +533,221 @@ return GdipCreateRegionRect(&rectf, region); } +static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) +{ + mbuf->buffer = buffer; + mbuf->size = size; + mbuf->pos = 0; +} + +static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) +{ + if (mbuf->size - mbuf->pos >= size) + { + const void *data = mbuf->buffer + mbuf->pos; + mbuf->pos += size; + return data; + } + return NULL; +} + +static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) +{ + GpStatus status; + const DWORD *type; + + type = buffer_read(mbuf, sizeof(DWORD)); + if (!type) return Ok; + + TRACE("type %#x\n", *type); + + node->type = *type; + + switch (node->type) + { + case CombineModeReplace: + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + region_element *left, *right; + + left = GdipAlloc(sizeof(region_element)); + if (!left) return OutOfMemory; + right = GdipAlloc(sizeof(region_element)); + if (!right) + { + GdipFree(left); + return OutOfMemory; + } + + status = read_element(mbuf, region, left, count); + if (status == Ok) + { + status = read_element(mbuf, region, right, count); + if (status == Ok) + { + node->elementdata.combine.left = left; + node->elementdata.combine.right = right; + region->num_children += 2; + return Ok; + } + } + + GdipFree(left); + GdipFree(right); + return status; + } + + case RegionDataRect: + { + const GpRectF *rc; + + rc = buffer_read(mbuf, sizeof(GpRectF)); + if (!rc) + { + ERR("failed to read rect data\n"); + return InvalidParameter; + } + + node->elementdata.rect = *rc; + *count += 1; + return Ok; + } + + case RegionDataPath: + { + GpPath *path; + const struct path_header *path_header; + const BYTE *types; + + path_header = buffer_read(mbuf, sizeof(struct path_header)); + if (!path_header) + { + ERR("failed to read path header\n"); + return InvalidParameter; + } + if (path_header->magic != VERSION_MAGIC) + { + ERR("invalid path header magic %#x\n", path_header->magic); + return InvalidParameter; + } + + /* Windows always fails to create an empty path in a region */ + if (!path_header->count) + { + TRACE("refusing to create an empty path in a region\n"); + return GenericError; + } + + status = GdipCreatePath(FillModeAlternate, &path); + if (status) return status; + + node->elementdata.path = path; + + if (!lengthen_path(path, path_header->count)) + return OutOfMemory; + + path->pathdata.Count = path_header->count; + + if (path_header->flags & ~FLAGS_INTPATH) + FIXME("unhandled path flags %#x\n", path_header->flags); + + if (path_header->flags & FLAGS_INTPATH) + { + const packed_point *pt; + DWORD i; + + pt = buffer_read(mbuf, sizeof(packed_point) * path_header->count); + if (!pt) + { + ERR("failed to read packed %u path points\n", path_header->count); + return InvalidParameter; + } + + for (i = 0; i < path_header->count; i++) + { + path->pathdata.Points[i].X = (REAL)pt[i].X; + path->pathdata.Points[i].Y = (REAL)pt[i].Y; + } + } + else + { + const GpPointF *ptf; + + ptf = buffer_read(mbuf, sizeof(GpPointF) * path_header->count); + if (!ptf) + { + ERR("failed to read %u path points\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Points, ptf, sizeof(GpPointF) * path_header->count); + } + + types = buffer_read(mbuf, path_header->count); + if (!types) + { + ERR("failed to read %u path types\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Types, types, path_header->count); + if (path_header->count & 3) + { + if (!buffer_read(mbuf, 4 - (path_header->count & 3))) + { + ERR("failed to read rounding %u bytes\n", 4 - (path_header->count & 3)); + return InvalidParameter; + } + } + + *count += 1; + return Ok; + } + + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + *count += 1; + return Ok; + + default: + FIXME("element type %#x is not supported\n", *type); + break; + } + + return InvalidParameter; +} + GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) { - FIXME("(%p, %d, %p): stub\n", data, size, region); - - *region = NULL; - return NotImplemented; + GpStatus status; + struct memory_buffer mbuf; + const struct region_header *region_header; + INT count; + + if (!data || !size) return InvalidParameter; + + TRACE("%p, %d, %p\n", data, size, region); + + init_memory_buffer(&mbuf, data, size); + + region_header = buffer_read(&mbuf, sizeof(struct region_header)); + if (!region_header || region_header->magic != VERSION_MAGIC) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) return status; + + count = 0; + status = read_element(&mbuf, *region, &(*region)->node, &count); + if (status == Ok && !count) + status = InvalidParameter; + + if (status != Ok) + GdipDeleteRegion(*region); + + return status; } @@ -726,15 +958,9 @@ { INT i; const GpPath* path = element->elementdata.path; - struct _pathheader - { - DWORD size; - DWORD magic; - DWORD count; - DWORD flags; - } *pathheader; - - pathheader = (struct _pathheader *)(buffer + *filled); + struct path_header *pathheader; + + pathheader = (struct path_header *)(buffer + *filled); pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; /* 3 for headers, once again size doesn't count itself */ @@ -811,13 +1037,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { - struct _region_header - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } *region_header; + struct region_header *region_header; INT filled = 0; UINT required; GpStatus status; @@ -835,7 +1055,7 @@ return InsufficientBuffer; } - region_header = (struct _region_header *)buffer; + region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -76,7 +76,7 @@ reactos/dll/win32/faultrep # Synced to Wine-1.7.27 reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to WineStaging-1.7.37 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.27 +reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.27 reactos/dll/win32/hlink # Synced to Wine-1.7.27 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.27

9 years, 9 months

[akhaldi] 66856: [MPLAY32] Give a valid pointer to a MCI_SEEK_PARMS structure when using MCI_SEEK_TO_START flag. By Ricardo Hanke. CORE-9408

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 22 18:07:59 2015 New Revision: 66856 URL: http://svn.reactos.org/svn/reactos?rev=66856&view=rev Log: [MPLAY32] Give a valid pointer to a MCI_SEEK_PARMS structure when using MCI_SEEK_TO_START flag. By Ricardo Hanke. CORE-9408 Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Mar 22 18:07:59 2015 @@ -640,6 +640,7 @@ { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; + MCI_SEEK_PARMS mciSeek; if (wDeviceId == 0) return; @@ -654,7 +655,7 @@ return; } - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, (DWORD_PTR)&mciSeek); UpdateTimeDisplay(hTimeDisplay); UpdateWindowCaption(hwnd); @@ -777,10 +778,11 @@ { MCIERROR mciError; MCI_PLAY_PARMS mciPlay; + MCI_SEEK_PARMS mciSeek; SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, (DWORD_PTR)&mciSeek); mciPlay.dwCallback = (DWORD_PTR)hwnd; mciPlay.dwFrom = 0;

9 years, 9 months

[cfinck] 66855: [ROSAUTOTEST] Make outputting a string as easy as it should be. Now that our StringOut internally uses OutputDebugStringA instead of DbgPrint, we don't need to output in 512 byte ch...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Mar 22 12:35:08 2015 New Revision: 66855 URL: http://svn.reactos.org/svn/reactos?rev=66855&view=rev Log: [ROSAUTOTEST] Make outputting a string as easy as it should be. Now that our StringOut internally uses OutputDebugStringA instead of DbgPrint, we don't need to output in 512 byte chunks anymore. Additionally, do an explicit flush when using std::cout to not lose debug output. ROSTESTS-158 #resolve #comment Committed in r66855 Modified: trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -276,7 +276,6 @@ stringstream ss, ssFinish; DWORD StartTime; float TotalTime; - string tailString; CPipe Pipe; char Buffer[1024]; @@ -295,7 +294,7 @@ { /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - tailString = StringOut(tailString.append(string(Buffer)), false); + StringOut(string(Buffer)); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -305,16 +304,9 @@ } catch(CTestException& e) { - if(!tailString.empty()) - StringOut(tailString); - tailString.clear(); StringOut(e.GetMessage()); TestInfo->Log += e.GetMessage(); } - - /* Print what's left */ - if(!tailString.empty()) - StringOut(tailString); TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -69,7 +69,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -string StringOut(const string& String, bool forcePrint = true); +void StringOut(const string& InputString); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -2,12 +2,11 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Various helper functions - * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2015 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" -#define DBGPRINT_BUFSIZE 511 static const char HexCharacters[] = "0123456789ABCDEF"; /** @@ -87,85 +86,43 @@ /** * Outputs a string through the standard output and the debug output. - * The string may have LF or CRLF line endings. - * - * @param String + * The input string may have LF or CRLF line endings. + * + * @param InputString * The std::string to output */ -string -StringOut(const string& String, bool forcePrint) -{ - char DbgString[DBGPRINT_BUFSIZE + 1]; - size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; - string NewString; +void +StringOut(const string& InputString) +{ + const char* pInput = InputString.c_str(); + char* OutputString = new char[InputString.size() + 1]; + char* pOutput = OutputString; /* Unify the line endings (the piped output of the tests may use CRLF) */ - for(i = 0; i < String.size(); i++) + while (*pInput) { /* If this is a CRLF line-ending, only copy a \n to the new string and skip the next character */ - if(String[i] == '\r' && String[i + 1] == '\n') - { - NewString += '\n'; - ++i; + if (*pInput == '\r' && *(pInput + 1) == '\n') + { + *pOutput = '\n'; + ++pInput; } else { - /* Otherwise copy the string */ - NewString += String[i]; - } - - curr_pos = NewString.size(); - - /* Try to print whole lines but obey the 512 bytes chunk size limit*/ - if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE) - { - if((curr_pos - start) >= DBGPRINT_BUFSIZE) - { - /* No newlines so far, or the string just fits */ - if(last_newline <= start || ((curr_pos - start == DBGPRINT_BUFSIZE) && NewString[curr_pos - 1] == '\n')) - { - size = curr_pos - start; - memcpy(DbgString, NewString.c_str() + start, size); - start = curr_pos; - } - else - { - size = last_newline - start; - memcpy(DbgString, NewString.c_str() + start, size); - start = last_newline; - } - - DbgString[size] = 0; - OutputDebugStringA(DbgString); - } - - last_newline = curr_pos; - } - } - - size = curr_pos - start; - - /* Only print if forced to or if the rest is a whole line */ - if(forcePrint == true || NewString[curr_pos - 1] == '\n') - { - /* Output the whole string */ - if(Configuration.DoPrint()) - cout << NewString; - - memcpy(DbgString, NewString.c_str() + start, size); - DbgString[size] = 0; - OutputDebugStringA(DbgString); - - NewString.clear(); - return NewString; - } - - /* Output full lines only */ - if(Configuration.DoPrint()) - cout << NewString.substr(0, start); - - /* Return the remaining chunk */ - return NewString.substr(start, size); + *pOutput = *pInput; + } + + ++pInput; + ++pOutput; + } + + *pOutput = 0; + OutputDebugStringA(OutputString); + + if (Configuration.DoPrint()) + cout << OutputString << flush; + + delete[] OutputString; } /**

9 years, 9 months

[khornicek] 66854: [WIN32K] - set the devmode size for ENUM_REGISTRY_SETTINGS case in NtUserEnumDisplaySettings so it gets copied back to caller later

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Mar 22 12:08:09 2015 New Revision: 66854 URL: http://svn.reactos.org/svn/reactos?rev=66854&view=rev Log: [WIN32K] - set the devmode size for ENUM_REGISTRY_SETTINGS case in NtUserEnumDisplaySettings so it gets copied back to caller later Modified: trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Mar 22 12:08:09 2015 @@ -602,6 +602,7 @@ /* Get the registry settings */ Status = UserEnumRegistryDisplaySettings(pustrDevice, &dmReg); pdm = &dmReg; + pdm->dmSize = sizeof(DEVMODEW); } else if (iModeNum == ENUM_CURRENT_SETTINGS) {

9 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
50
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 March 2015