Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[tkreuzer] 44966: [RTL] Reduce difference to trunk (wtf happened to actctx.c?)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 23:12:20 2010 New Revision: 44966 URL: http://svn.reactos.org/svn/reactos?rev=44966&view=rev Log: [RTL] Reduce difference to trunk (wtf happened to actctx.c?) Modified: branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c branches/ros-amd64-bringup/reactos/lib/rtl/exception.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] Tue Jan 5 23:12:20 2010 @@ -25,14 +25,14 @@ #define QUERY_ACTCTX_FLAG_ACTIVE (0x00000001) #define ACTCTX_FLAGS_ALL (\ - ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ - ACTCTX_FLAG_LANGID_VALID |\ - ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID |\ - ACTCTX_FLAG_RESOURCE_NAME_VALID |\ - ACTCTX_FLAG_SET_PROCESS_DEFAULT |\ - ACTCTX_FLAG_APPLICATION_NAME_VALID |\ - ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF |\ - ACTCTX_FLAG_HMODULE_VALID ) + ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ + ACTCTX_FLAG_LANGID_VALID |\ + ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID |\ + ACTCTX_FLAG_RESOURCE_NAME_VALID |\ + ACTCTX_FLAG_SET_PROCESS_DEFAULT |\ + ACTCTX_FLAG_APPLICATION_NAME_VALID |\ + ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF |\ + ACTCTX_FLAG_HMODULE_VALID ) #define ACTCTX_MAGIC 0xC07E3E11 @@ -1602,7 +1602,7 @@ DPRINT( "looking for res %s in module %p %s\n", debugstr_w(resname), hModule, debugstr_w(nameW.Buffer) ); RtlFreeUnicodeString( &nameW ); -} + } else DPRINT( "looking for res %s in module %p %s\n", debugstr_w(resname), hModule, debugstr_w(filename) ); } @@ -1613,10 +1613,10 @@ info.Type = (ULONG_PTR)RT_MANIFEST; info.Language = lang; if (!((ULONG_PTR)resname >> 16)) -{ + { info.Name = (ULONG_PTR)resname; status = LdrFindResource_U(hModule, &info, 3, &entry); -} + } else if (resname[0] == '#') { ULONG value; @@ -1680,7 +1680,7 @@ { HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */ status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); -} + } else status = STATUS_INVALID_IMAGE_FORMAT; NtUnmapViewOfSection( NtCurrentProcess(), base ); @@ -1737,7 +1737,7 @@ /* try to load the .manifest file associated to the file */ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, HMODULE module, LPCWSTR resname ) - { +{ static const WCHAR fmtW[] = { '.','%','l','u',0 }; WCHAR *buffer; NTSTATUS status; @@ -1760,7 +1760,7 @@ if (!RtlDosPathNameToNtPathName_U( name.Buffer, &nameW, NULL, NULL )) status = STATUS_RESOURCE_DATA_NOT_FOUND; RtlFreeUnicodeString( &name ); - } + } if (status) return status; } else @@ -1960,7 +1960,7 @@ * appdir\name.manifest * appdir\name\name.dll * appdir\name\name.manifest - */ + */ strcpyW( buffer, acl->actctx->appdir.info ); p = buffer + strlenW(buffer); for (i = 0; i < 2; i++) @@ -2085,7 +2085,7 @@ struct dll_redirect *dll = &assembly->dlls[j]; if (!strncmpiW(section_name->Buffer, dll->name, snlen) && !dll->name[snlen]) return fill_keyed_data(data, dll, assembly, i); -} + } } return STATUS_SXS_KEY_NOT_FOUND; } @@ -2118,7 +2118,7 @@ static NTSTATUS find_string(ACTIVATION_CONTEXT* actctx, ULONG section_kind, const UNICODE_STRING *section_name, DWORD flags, PACTCTX_SECTION_KEYED_DATA data) - { +{ NTSTATUS status; switch (section_kind) @@ -2209,7 +2209,7 @@ if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; -} + } nameW.Buffer = NULL; if (pActCtx->lpSource) @@ -2314,7 +2314,7 @@ *cookie = (ULONG_PTR)frame; DPRINT( "%p cookie=%lx\n", handle, *cookie ); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } @@ -2348,7 +2348,7 @@ top = frame; } - return STATUS_SUCCESS; + return STATUS_SUCCESS; } VOID @@ -2363,7 +2363,7 @@ RtlReleaseActivationContext( frame->ActivationContext ); RtlFreeHeap( RtlGetProcessHeap(), 0, frame ); frame = prev; -} + } NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NULL; } @@ -2375,7 +2375,7 @@ { *handle = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext; RtlAddRefActivationContext( *handle ); -} + } else *handle = 0; @@ -2420,11 +2420,11 @@ info->hActCtx = handle; info->dwFlags = 0; /* FIXME */ if (!(flags & QUERY_ACTCTX_FLAG_NO_ADDREF)) RtlAddRefActivationContext( handle ); -} + } break; case ActivationContextDetailedInformation: -{ + { ACTIVATION_CONTEXT_DETAILED_INFORMATION *acdi = buffer; struct assembly *assembly = NULL; SIZE_T len, manifest_len = 0, config_len = 0, appdir_len = 0; @@ -2433,7 +2433,7 @@ if (!(actctx = check_actctx(handle))) return STATUS_INVALID_PARAMETER; if (actctx->num_assemblies) assembly = actctx->assemblies; - + if (assembly && assembly->manifest.info) manifest_len = strlenW(assembly->manifest.info) + 1; if (actctx->config.info) config_len = strlenW(actctx->config.info) + 1; @@ -2454,30 +2454,30 @@ acdi->ulAppDirPathChars = actctx->appdir.info ? appdir_len - 1 : 0; ptr = (LPWSTR)(acdi + 1); if (manifest_len) - { + { acdi->lpRootManifestPath = ptr; memcpy(ptr, assembly->manifest.info, manifest_len * sizeof(WCHAR)); ptr += manifest_len; } else acdi->lpRootManifestPath = NULL; if (config_len) - { + { acdi->lpRootConfigurationPath = ptr; memcpy(ptr, actctx->config.info, config_len * sizeof(WCHAR)); ptr += config_len; - } + } else acdi->lpRootConfigurationPath = NULL; if (appdir_len) - { + { acdi->lpAppDirPath = ptr; memcpy(ptr, actctx->appdir.info, appdir_len * sizeof(WCHAR)); - } + } else acdi->lpAppDirPath = NULL; - } + } break; case AssemblyDetailedInformationInActivationContext: - { + { ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *afdi = buffer; struct assembly *assembly; WCHAR *assembly_id; @@ -2505,10 +2505,10 @@ if (retlen) *retlen = len; if (!buffer || bufsize < len) - { + { RtlFreeHeap( RtlGetProcessHeap(), 0, assembly_id ); return STATUS_BUFFER_TOO_SMALL; - } + } afdi->ulFlags = 0; /* FIXME */ afdi->ulEncodedAssemblyIdentityLength = (id_len - 1) * sizeof(WCHAR); @@ -2529,7 +2529,7 @@ memcpy( ptr, assembly_id, id_len * sizeof(WCHAR) ); ptr += id_len; if (path_len) - { + { afdi->lpAssemblyManifestPath = ptr; memcpy(ptr, assembly->manifest.info, path_len * sizeof(WCHAR)); ptr += path_len; @@ -2540,7 +2540,7 @@ afdi->lpAssemblyDirectoryName = ptr; memcpy(ptr, assembly->directory, ad_len * sizeof(WCHAR)); ptr += ad_len; - } + } else afdi->lpAssemblyDirectoryName = NULL; RtlFreeHeap( RtlGetProcessHeap(), 0, assembly_id ); } @@ -2573,7 +2573,7 @@ { if (retlen) *retlen = len; return STATUS_BUFFER_TOO_SMALL; - } + } if (retlen) *retlen = 0; /* yes that's what native does !! */ afdi->ulFlags = ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION; afdi->ulFilenameLength = dll_len ? (dll_len - 1) * sizeof(WCHAR) : 0; @@ -2585,7 +2585,7 @@ memcpy( ptr, dll->name, dll_len * sizeof(WCHAR) ); } else afdi->lpFileName = NULL; afdi->lpFilePath = NULL; /* FIXME */ - } + } break; default: @@ -2599,7 +2599,7 @@ NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, UNICODE_STRING *section_name, PVOID ptr ) - { +{ PACTCTX_SECTION_KEYED_DATA data = ptr; NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; Modified: branches/ros-amd64-bringup/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/exception.c [iso-8859-1] Tue Jan 5 23:12:20 2010 @@ -17,7 +17,7 @@ /* FUNCTIONS ***************************************************************/ -#if !defined(_M_IX86) && !defined(_M_AMD64) +#if !defined(_M_IX86) /* * @implemented @@ -62,10 +62,6 @@ /* If we returned, raise a status */ RtlRaiseStatus(Status); } - -#endif - -#if !defined(_M_IX86) #ifdef _MSC_VER #pragma warning(push)

14 years, 8 months

[gedmurphy] 44965: Clean up the pause and resume code and a few other bits and bobs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 22:43:00 2010 New Revision: 44965 URL: http://svn.reactos.org/svn/reactos?rev=44965&view=rev Log: Clean up the pause and resume code and a few other bits and bobs Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Tue Jan 5 22:43:00 2010 @@ -2,158 +2,168 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/control.c - * PURPOSE: Stops, pauses and resumes a service - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * PURPOSE: Pauses and resumes a service + * COPYRIGHT: Copyright 2006-2010 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -BOOL -Control(PMAIN_WND_INFO Info, - HWND hProgDlg, - DWORD Control) +static BOOL +DoControl(PMAIN_WND_INFO Info, + HWND hProgress, + DWORD Control) { SC_HANDLE hSCManager; - SC_HANDLE hSc; + SC_HANDLE hService; SERVICE_STATUS_PROCESS ServiceStatus = {0}; SERVICE_STATUS Status; DWORD BytesNeeded = 0; + DWORD dwStartTickCount; + DWORD dwOldCheckPoint; + DWORD dwWaitTime; + DWORD dwMaxWait; BOOL bRet = FALSE; - BOOL bDispErr = TRUE; hSCManager = OpenSCManager(NULL, NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager != NULL) + SC_MANAGER_CONNECT); + if (hSCManager) { - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_ALL_ACCESS); - if (hSc != NULL) + hService = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_CONFIG); + if (hService) { - if (ControlService(hSc, + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } + + /* Send the control message to the service */ + if (ControlService(hService, Control, &Status)) { - bDispErr = FALSE; - - if (QueryServiceStatusEx(hSc, + /* Get the service status */ + if (QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&ServiceStatus, sizeof(SERVICE_STATUS_PROCESS), &BytesNeeded)) { - DWORD dwStartTickCount = GetTickCount(); - DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; - DWORD dwMaxWait = 2000 * 60; // wait for 2 mins + /* We don't want to wait for more than 30 seconds */ + dwMaxWait = 30000; + dwStartTickCount = GetTickCount(); - IncrementProgressBar(hProgDlg, DEFAULT_STEP); - + /* Loop until it's at the correct state */ while (ServiceStatus.dwCurrentState != Control) { - DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + dwWaitTime = ServiceStatus.dwWaitHint / 10; - if (!QueryServiceStatusEx(hSc, + /* Get the latest status info */ + if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)&ServiceStatus, sizeof(SERVICE_STATUS_PROCESS), &BytesNeeded)) { + /* Something went wrong... */ break; } + /* Is the service making progress? */ if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) { - /* The service is making progress, increment the progress bar */ - IncrementProgressBar(hProgDlg, DEFAULT_STEP); + /* It is, get the latest tickcount to reset the max wait time */ dwStartTickCount = GetTickCount(); dwOldCheckPoint = ServiceStatus.dwCheckPoint; + IncrementProgressBar(hProgress, DEFAULT_STEP); } else { + /* It's not, make sure we haven't exceeded our wait time */ if(GetTickCount() >= dwStartTickCount + dwMaxWait) { - /* give up */ + /* We have, give up */ break; } } - if(dwWaitTime < 200) + /* Adjust the wait hint times */ + if (dwWaitTime < 200) dwWaitTime = 200; else if (dwWaitTime > 10000) dwWaitTime = 10000; + /* Wait before trying again */ Sleep(dwWaitTime); } } + + if (ServiceStatus.dwCurrentState == Control) + { + bRet = TRUE; + } } - CloseServiceHandle(hSc); + CloseServiceHandle(hService); } CloseServiceHandle(hSCManager); } - if (ServiceStatus.dwCurrentState == Control) + return bRet; +} + + +BOOL +DoPause(PMAIN_WND_INFO Info) +{ + HWND hProgress; + BOOL bRet = FALSE; + + /* Create a progress window to track the progress of the pausing service */ + hProgress = CreateProgressDialog(Info->hMainWnd, + IDS_PROGRESS_INFO_PAUSE); + if (hProgress) { - CompleteProgressBar(hProgDlg); - Sleep(500); - bRet = TRUE; - } - else - { - if (bDispErr) - GetError(); - else - DisplayString(_T("The service failed to start")); + /* Set the service name and reset the progress bag */ + InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); + + /* Resume the requested service */ + bRet = DoControl(Info, hProgress, SERVICE_CONTROL_PAUSE); + + /* Complete and destroy the progress bar */ + DestroyProgressDialog(hProgress, bRet); } return bRet; - - } -BOOL DoPause(PMAIN_WND_INFO Info) +BOOL +DoResume(PMAIN_WND_INFO Info) { - BOOL ret = FALSE; - HWND hProgDlg; + HWND hProgress; + BOOL bRet = FALSE; - hProgDlg = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_PAUSE); - if (hProgDlg) + /* Create a progress window to track the progress of the resuming service */ + hProgress = CreateProgressDialog(Info->hMainWnd, + IDS_PROGRESS_INFO_RESUME); + if (hProgress) { - InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); + /* Set the service name and reset the progress bag */ + InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_PAUSE); + /* Resume the requested service */ + bRet = DoControl(Info, hProgress, SERVICE_CONTROL_CONTINUE); - DestroyWindow(hProgDlg); + /* Complete and destroy the progress bar */ + DestroyProgressDialog(hProgress, bRet); } - return ret; + return bRet; } - - -BOOL DoResume(PMAIN_WND_INFO Info) -{ - BOOL ret = FALSE; - HWND hProgDlg; - - hProgDlg = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_RESUME); - if (hProgDlg) - { - InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); - - ret = Control(Info, - hProgDlg, - SERVICE_CONTROL_CONTINUE); - - DestroyWindow(hProgDlg); - } - - return ret; -} Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Tue Jan 5 22:43:00 2010 @@ -90,7 +90,7 @@ } STOP_INFO, *PSTOP_INFO; /* control */ -BOOL Control(PMAIN_WND_INFO Info, HWND hProgDlg, DWORD Control); +BOOL Control(PMAIN_WND_INFO Info, HWND hProgress, DWORD Control); BOOL DoStop(PMAIN_WND_INFO Info); BOOL DoPause(PMAIN_WND_INFO Info); BOOL DoResume(PMAIN_WND_INFO Info); @@ -98,10 +98,10 @@ /* progress.c */ #define DEFAULT_STEP 0 HWND CreateProgressDialog(HWND hParent, UINT LabelId); -BOOL DestroyProgressDialog(HWND hProgDlg, BOOL bComplete); -VOID InitializeProgressDialog(HWND hProgDlg, LPWSTR lpServiceName); -VOID IncrementProgressBar(HWND hProgDlg, UINT NewPos); -VOID CompleteProgressBar(HWND hProgDlg); +BOOL DestroyProgressDialog(HWND hProgress, BOOL bComplete); +VOID InitializeProgressDialog(HWND hProgress, LPWSTR lpServiceName); +VOID IncrementProgressBar(HWND hProgress, UINT NewPos); +VOID CompleteProgressBar(HWND hProgress); /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Tue Jan 5 22:43:00 2010 @@ -39,6 +39,7 @@ IncrementProgressBar(hProgress, DEFAULT_STEP); } + /* Start the service */ bRet = StartService(hService, 0, NULL); @@ -85,6 +86,7 @@ /* It is, get the latest tickcount to reset the max wait time */ dwStartTickCount = GetTickCount(); dwOldCheckPoint = ServiceStatus.dwCheckPoint; + IncrementProgressBar(hProgress, DEFAULT_STEP); } else { Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 22:43:00 2010 @@ -197,6 +197,10 @@ /* Don't stop the main service if the user selected not to */ bStopMainService = FALSE; } + + HeapFree(GetProcessHeap(), + 0, + lpServiceList); } /* If the service has no running dependents, then we stop it here */

14 years, 8 months

[tkreuzer] 44964: add global allowwarning="true" and unhack the other rbuild files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 22:18:17 2010 New Revision: 44964 URL: http://svn.reactos.org/svn/reactos?rev=44964&view=rev Log: add global allowwarning="true" and unhack the other rbuild files Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/ext2.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/oskittcp.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> <xi:fallback> <xi:include href="config-amd64.template.rbuild" /> Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings=true> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <define name="LANGPACK" /> Modified: branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/imagehlp/imagehlp.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll"> <importlibrary definition="imagehlp.spec" /> <include base="imagehlp">.</include> <define name="_IMAGEHLP_SOURCE_"></define> Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" allowwarnings="true"> +<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> <importlibrary definition="kernel32.pspec" /> <include base="kernel32">.</include> <include base="kernel32" root="intermediate">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,4 +1,4 @@ -<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes" allowwarnings="true"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes"> <importlibrary definition="msafd.spec" /> <include base="msafd">.</include> <include base="msafd">include</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,4 +1,4 @@ -<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes" allowwarnings="true"> +<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes"> <importlibrary definition="ws2_32.spec" /> <include base="ws2_32">include</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,4 +1,4 @@ -<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll" allowwarnings="true"> +<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> <importlibrary definition="ws2help.spec" /> <include base="ws2help">.</include> <include base="ReactOS">include/reactos/winsock</include> Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys" allowwarnings="true"> +<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext2fs">inc</include> <compilerflag compilerset="msc">/wd4003</compilerflag> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="icu4ros" type="staticlibrary" allowwarnings="true"> +<module name="icu4ros" type="staticlibrary"> <define name="U_STATIC_IMPLEMENTATION" /> <define name="U_HAVE_INTTYPES_H" /> <define name="UCONFIG_NO_FILE_IO">1</define> Modified: branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="oskittcp" type="staticlibrary" allowwarnings="true"> +<module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> <include base="oskittcp">include/freebsd</include> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -7,7 +7,7 @@ <if property="ARCH" value="amd64"> <property name="BASEADDRESS_NTOSKRNL" value="0xfffff80000800000" /> </if> - <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="${BASEADDRESS_NTOSKRNL}" entrypoint="KiSystemStartup" allowwarnings="true"> + <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe" baseaddress="${BASEADDRESS_NTOSKRNL}" entrypoint="KiSystemStartup"> <xi:include href="ntoskrnl-generic.rbuild" /> </module> </group> Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Tue Jan 5 22:18:17 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr" allowwarnings="true"> +<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr"> <importlibrary definition="win32k.pspec" /> <library>pseh</library> <library>ntoskrnl</library>

14 years, 8 months

[gedmurphy] 44963: Clean up the start code

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 22:14:10 2010 New Revision: 44963 URL: http://svn.reactos.org/svn/reactos?rev=44963&view=rev Log: Clean up the start code Modified: trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Tue Jan 5 22:14:10 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/start.c * PURPOSE: Start a service - * COPYRIGHT: Copyright 2005-2009 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2005-2010 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -11,7 +11,7 @@ static BOOL DoStartService(PMAIN_WND_INFO Info, - HWND hProgDlg) + HWND hProgress) { SC_HANDLE hSCManager; SC_HANDLE hService; @@ -25,72 +25,86 @@ hSCManager = OpenSCManager(NULL, NULL, - SC_MANAGER_ALL_ACCESS); - if (!hSCManager) + SC_MANAGER_CONNECT); + if (hSCManager) { - return FALSE; - } + hService = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_START | SERVICE_QUERY_STATUS); + if (hService) + { + if (hProgress) + { + /* Increment the progress bar */ + IncrementProgressBar(hProgress, DEFAULT_STEP); + } - hService = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_START | SERVICE_QUERY_STATUS); - if (hService) - { - bRet = StartService(hService, - 0, - NULL); - if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) - { - bRet = TRUE; - } - else if (bRet) - { - bRet = FALSE; + bRet = StartService(hService, + 0, + NULL); + if (!bRet && GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) + { + /* If it's already running, just return TRUE */ + bRet = TRUE; + } + else if (bRet) + { + bRet = FALSE; - if (QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - dwMaxWait = 30000; // 30 secs + /* Get the service status to check if it's running */ + if (QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + /* We don't want to wait for more than 30 seconds */ + dwMaxWait = 30000; + dwStartTickCount = GetTickCount(); - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) - { - dwWaitTime = ServiceStatus.dwWaitHint / 10; + /* Loop until it's running */ + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + { + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + dwWaitTime = ServiceStatus.dwWaitHint / 10; - if (!QueryServiceStatusEx(hService, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - break; - } - - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* The service is making progress*/ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - if (GetTickCount() >= dwStartTickCount + dwMaxWait) + /* Get the latest status info */ + if (!QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { - /* We exceeded our max wait time, give up */ + /* Something went wrong... */ break; } + + /* Is the service making progress? */ + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* It is, get the latest tickcount to reset the max wait time */ + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + /* It's not, make sure we haven't exceeded our wait time */ + if (GetTickCount() >= dwStartTickCount + dwMaxWait) + { + /* We have, give up */ + break; + } + } + + /* Adjust the wait hint times */ + if (dwWaitTime < 200) + dwWaitTime = 200; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; + + /* Wait before trying again */ + Sleep(dwWaitTime); } - - if (dwWaitTime < 200) - dwWaitTime = 200; - else if (dwWaitTime > 10000) - dwWaitTime = 10000; - - Sleep(dwWaitTime); } if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) @@ -98,13 +112,12 @@ bRet = TRUE; } } + + CloseServiceHandle(hService); } - CloseServiceHandle(hService); + CloseServiceHandle(hSCManager); } - - CloseServiceHandle(hSCManager); - return bRet; } @@ -112,31 +125,22 @@ BOOL DoStart(PMAIN_WND_INFO Info) { - HWND hProgDlg; + HWND hProgress; BOOL bRet = FALSE; - hProgDlg = CreateProgressDialog(Info->hMainWnd, - IDS_PROGRESS_INFO_START); + /* Create a progress window to track the progress of the stopping service */ + hProgress = CreateProgressDialog(Info->hMainWnd, + IDS_PROGRESS_INFO_START); + if (hProgress) + { + /* Set the service name and reset the progress bag */ + InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName); - if (hProgDlg) - { - InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); + /* Start the requested service */ + bRet = DoStartService(Info, hProgress); - bRet = DoStartService(Info, - hProgDlg); - - if (bRet) - { - CompleteProgressBar(hProgDlg); - Sleep(500); - bRet = TRUE; - } - else - { - GetError(); - } - - DestroyWindow(hProgDlg); + /* Complete and destroy the progress bar */ + DestroyProgressDialog(hProgress, bRet); } return bRet;

14 years, 8 months

[tkreuzer] 44962: Reduce differences to trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 21:42:07 2010 New Revision: 44962 URL: http://svn.reactos.org/svn/reactos?rev=44962&view=rev Log: Reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -1709,7 +1709,7 @@ PUNICODE_STRING ClassName); #endif -DWORD_PTR +HANDLE NTAPI NtUserGetClipboardData( UINT uFormat, @@ -2881,7 +2881,7 @@ NTAPI NtUserTranslateMessage( LPMSG lpMsg, - UINT Flags ); + HKL dwhkl ); BOOL NTAPI Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -77,8 +77,7 @@ Object_t **Object, DWORD Access ) { - ULONG_PTR h = (ULONG_PTR)Handle >> 2; - DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); + ULONG_PTR h = (ULONG_PTR)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); @@ -131,8 +130,8 @@ PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG_PTR h = (ULONG_PTR)Handle >> 2; - Object_t *Object; + ULONG_PTR h = (ULONG_PTR)Handle >> 2; + Object_t *Object; RtlEnterCriticalSection(&ProcessData->HandleTableLock); if (h >= ProcessData->HandleTableSize @@ -188,7 +187,7 @@ ProcessData->HandleTable[i].Object = Object; ProcessData->HandleTable[i].Access = Access; ProcessData->HandleTable[i].Inheritable = Inheritable; - *Handle = ULongToHandle(((i << 2) | 0x3)); + *Handle = UlongToHandle((i << 2) | 0x3); _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); @@ -240,7 +239,7 @@ PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG_PTR h = (ULONG_PTR)Handle >> 2; + ULONG_PTR h = (ULONG_PTR)Handle >> 2; if (h >= ProcessData->HandleTableSize || ProcessData->HandleTable[h].Object == NULL) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -188,7 +188,7 @@ LRESULT FASTCALL IntDispatchMessage(MSG* Msg); BOOL FASTCALL -IntTranslateKbdMessage(LPMSG lpMsg, UINT flags); +IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl); VOID FASTCALL co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -258,7 +258,7 @@ ExFreePool(DriverInfo->DriverName.Buffer); RemoveEntryList(&DriverInfo->ListEntry); ExFreePool(DriverInfo); - } - } + } +} /* EOF */ Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -640,7 +640,7 @@ UserEnterCo(); IntCbFreeMemory(Argument); - + if (!NT_SUCCESS(Status)) { return 0; @@ -700,7 +700,7 @@ Result = *(LRESULT*)ResultPointer; IntCbFreeMemory(Argument); - + if (!NT_SUCCESS(Status)) { return 0; Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -551,7 +551,7 @@ Class->pclsClone = NULL; Class->pclsBase = BaseClass; Class->pclsNext = BaseClass->pclsClone; - (void)InterlockedExchangePointer((VOID*)&BaseClass->pclsClone, + (void)InterlockedExchangePointer((PVOID*)&BaseClass->pclsClone, Class); } } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -581,10 +581,10 @@ return ret; } -DWORD_PTR APIENTRY +HANDLE APIENTRY NtUserGetClipboardData(UINT uFormat, PVOID pBuffer) { - DWORD_PTR ret = 0; + HANDLE ret = NULL; UserEnterShared(); @@ -607,7 +607,7 @@ co_IntSendMessage(ClipboardOwnerWindow->hSelf, WM_RENDERFORMAT, (WPARAM)uFormat, 0); data = intIsFormatAvailable(uFormat); ASSERT(data->size); - ret = data->size; + ret = (HANDLE)(ULONG_PTR)data->size; } } else @@ -618,12 +618,12 @@ } } - ret = data->size; + ret = (HANDLE)(ULONG_PTR)data->size; } else { /* there is no data in this format */ - //ret = FALSE; + //ret = (HANDLE)FALSE; } } else @@ -646,12 +646,12 @@ PCLIPBOARDELEMENT data = intIsFormatAvailable(CF_DIB); if (data) { - ret = (DWORD_PTR)renderBITMAPfromDIB(data->hData); + ret = renderBITMAPfromDIB(data->hData); } } else { - ret = (DWORD_PTR)pBuffer; + ret = (HANDLE)pBuffer; _SEH2_TRY { @@ -660,7 +660,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ret = 0; + ret = NULL; } _SEH2_END @@ -669,7 +669,7 @@ } else { - ret = (DWORD_PTR)pBuffer; + ret = (HANDLE)pBuffer; _SEH2_TRY { @@ -678,7 +678,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ret = 0; + ret = NULL; } _SEH2_END } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -298,7 +298,7 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ Status = co_MsqSendMessage(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue, - (HWND)(UINT_PTR)Code, + IntToPtr(Code), Hook->HookId, wParam, lParam, Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -419,7 +419,7 @@ BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, - UINT Flags) + HKL dwhkl) { PTHREADINFO pti; static INT dead_char = 0; Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -2195,7 +2195,7 @@ BOOL APIENTRY NtUserTranslateMessage(LPMSG lpMsg, - UINT flags) + HKL dwhkl) { NTSTATUS Status; MSG SafeMsg; @@ -2211,7 +2211,7 @@ RETURN( FALSE); } - RETURN( IntTranslateKbdMessage(&SafeMsg, flags)); + RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl)); CLEANUP: DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec [iso-8859-1] Tue Jan 5 21:42:07 2010 @@ -1,3 +1,4 @@ +#include "include/reactos/msvctarget.h" #undef i386 @ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add

14 years, 8 months

[gedmurphy] 44961: [SERVMAN] - Fully implement stopping all dependent services - When stopping a service, only list other running services which require stopping - Use the same progress dialog for stopping multiple services and make it smoother

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 21:41:14 2010 New Revision: 44961 URL: http://svn.reactos.org/svn/reactos?rev=44961&view=rev Log: [SERVMAN] - Fully implement stopping all dependent services - When stopping a service, only list other running services which require stopping - Use the same progress dialog for stopping multiple services and make it smoother Modified: trunk/reactos/base/applications/mscutils/servman/control.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/progress.c trunk/reactos/base/applications/mscutils/servman/start.c trunk/reactos/base/applications/mscutils/servman/stop.c trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -121,10 +121,11 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_PAUSE); if (hProgDlg) { + InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); + ret = Control(Info, hProgDlg, SERVICE_CONTROL_PAUSE); @@ -142,10 +143,11 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_RESUME); if (hProgDlg) { + InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); + ret = Control(Info, hProgDlg, SERVICE_CONTROL_CONTINUE); Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -97,8 +97,9 @@ /* progress.c */ #define DEFAULT_STEP 0 -HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, UINT LabelId); +HWND CreateProgressDialog(HWND hParent, UINT LabelId); BOOL DestroyProgressDialog(HWND hProgDlg, BOOL bComplete); +VOID InitializeProgressDialog(HWND hProgDlg, LPWSTR lpServiceName); VOID IncrementProgressBar(HWND hProgDlg, UINT NewPos); VOID CompleteProgressBar(HWND hProgDlg); Modified: trunk/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -75,6 +75,25 @@ } } +VOID +InitializeProgressDialog(HWND hProgDlg, + LPWSTR lpServiceName) +{ + /* Write the service name to the dialog */ + SendDlgItemMessageW(hProgDlg, + IDC_SERVCON_NAME, + WM_SETTEXT, + 0, + (LPARAM)lpServiceName); + + /* Set the progress bar to the start */ + SendDlgItemMessageW(hProgDlg, + IDC_SERVCON_PROGRESS, + PBM_SETPOS, + 0, + 0); +} + INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, @@ -124,7 +143,6 @@ HWND CreateProgressDialog(HWND hParent, - LPTSTR lpServiceName, UINT LabelId) { HWND hProgDlg; @@ -153,13 +171,6 @@ 0, lpProgStr); } - - /* Write the service name to the dialog */ - SendDlgItemMessageW(hProgDlg, - IDC_SERVCON_NAME, - WM_SETTEXT, - 0, - (LPARAM)lpServiceName); } return hProgDlg; Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -116,12 +116,11 @@ BOOL bRet = FALSE; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_START); if (hProgDlg) { - IncrementProgressBar(hProgDlg, DEFAULT_STEP); + InitializeProgressDialog(hProgDlg, Info->pCurrentService->lpServiceName); bRet = DoStartService(Info, hProgDlg); Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -25,8 +25,8 @@ if (hProgress) { - /* Increment the progress bar */ - IncrementProgressBar(hProgress, DEFAULT_STEP); + /* Set the service name and reset the progress bag */ + InitializeProgressDialog(hProgress, lpServiceName); } hSCManager = OpenSCManager(NULL, @@ -62,6 +62,10 @@ while (ServiceStatus.dwCurrentState != SERVICE_STOPPED) { + /* Don't sleep for more than 3 seconds */ + if (ServiceStatus.dwWaitHint > 3000) + ServiceStatus.dwWaitHint = 3000; + Sleep(ServiceStatus.dwWaitHint); if (hProgress) @@ -103,11 +107,41 @@ static BOOL StopDependantServices(PMAIN_WND_INFO pInfo, - LPWSTR lpServiceName) + LPWSTR lpServiceList, + HWND hProgress OPTIONAL) { + LPWSTR lpStr; BOOL bRet = FALSE; - MessageBox(NULL, L"Rewrite StopDependentServices", NULL, 0); + lpStr = lpServiceList; + + /* Loop through all the services in the list */ + while (TRUE) + { + /* Break when we hit the double null */ + if (*lpStr == L'\0' && *(lpStr + 1) == L'\0') + break; + + /* If this isn't our first time in the loop we'll + have been left on a null char */ + if (*lpStr == L'\0') + lpStr++; + + /* Stop the requested service */ + bRet = StopService(pInfo, + lpStr, + hProgress); + + /* Complete the progress bar if we succeeded */ + if (bRet) + { + CompleteProgressBar(hProgress); + } + + /* Move onto the next string */ + while (*lpStr != L'\0') + lpStr++; + } return bRet; } @@ -119,43 +153,57 @@ HWND hProgress; LPWSTR lpServiceList; BOOL bRet = FALSE; - BOOL bStop = TRUE; + BOOL bStopMainService = TRUE; if (pInfo) { - /* Does this service have anything which depends on it? */ - if (TV2_HasDependantServices(pInfo->pCurrentService->lpServiceName)) - { - /* It does, get a list of all the services which need stopping */ - lpServiceList = GetListOfServicesToStop(pInfo->pCurrentService->lpServiceName); - if (lpServiceList) - { - /* Tag the service list to the main wnd info */ - pInfo->pTag = (PVOID)lpServiceList; - - /* List them and ask the user if they want to stop them */ - if (DialogBoxParamW(hInstance, - MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)pInfo) == IDOK) - { - /* Stop all the dependant services */ - StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName); - } - else - { - /* Don't stop the main service if the user selected not to */ - bStop = FALSE; - } - } - } - - if (bStop) + /* Does the service have any dependent services which need stopping first */ + lpServiceList = GetListOfServicesToStop(pInfo->pCurrentService->lpServiceName); + if (lpServiceList) + { + /* Tag the service list to the main wnd info */ + pInfo->pTag = (PVOID)lpServiceList; + + /* List them and ask the user if they want to stop them */ + if (DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)pInfo) == IDOK) + { + /* Create a progress window to track the progress of the stopping services */ + hProgress = CreateProgressDialog(pInfo->hMainWnd, + IDS_PROGRESS_INFO_STOP); + + /* Stop all the dependant services */ + StopDependantServices(pInfo, lpServiceList, hProgress); + + /* Now stop the requested one */ + bRet = StopService(pInfo, + pInfo->pCurrentService->lpServiceName, + hProgress); + + /* We've already stopped the main service, don't try to stop it again */ + bStopMainService = FALSE; + + if (hProgress) + { + /* Complete and destroy the progress bar */ + DestroyProgressDialog(hProgress, TRUE); + } + } + else + { + /* Don't stop the main service if the user selected not to */ + bStopMainService = FALSE; + } + } + + /* If the service has no running dependents, then we stop it here */ + if (bStopMainService) { /* Create a progress window to track the progress of the stopping service */ hProgress = CreateProgressDialog(pInfo->hMainWnd, - pInfo->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); /* Stop the requested service */ Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Tue Jan 5 21:41:14 2010 @@ -95,18 +95,24 @@ { for (i = 0; i < dwCount; i++) { - /* Does this service have any dependents? */ - if (TV2_HasDependantServices(lpServiceStatus[i].lpServiceName)) + /* Does this service need stopping? */ + if (lpServiceStatus[i].ServiceStatus.dwCurrentState != SERVICE_STOPPED && + lpServiceStatus[i].ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING) { - /* recall this function with the dependent */ - BuildListOfServicesToStop(lpServiceList, lpServiceStatus[i].lpServiceName); + /* Does this service have any dependents? */ + if (TV2_HasDependantServices(lpServiceStatus[i].lpServiceName)) + { + /* recall this function with the dependent */ + BuildListOfServicesToStop(lpServiceList, lpServiceStatus[i].lpServiceName); + } + + /* Add the service to the list */ + *lpServiceList = AddServiceToList(lpServiceList, lpServiceStatus[i].lpServiceName); + + /* We've got one */ + bRet = TRUE; } - - /* Add the service to the list */ - *lpServiceList = AddServiceToList(lpServiceList, lpServiceStatus[i].lpServiceName); - } - - bRet = TRUE; + } HeapFree(GetProcessHeap(), 0,

14 years, 8 months

[ekohl] 44960: [spoolsv] - Switch to wine debug macros. Add new debug channel spoolsv. - Update service status when the service receives a control message.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jan 5 21:32:02 2010 New Revision: 44960 URL: http://svn.reactos.org/svn/reactos?rev=44960&view=rev Log: [spoolsv] - Switch to wine debug macros. Add new debug channel spoolsv. - Update service status when the service receives a control message. Modified: trunk/reactos/base/services/spoolsv/spoolsv.c trunk/reactos/base/services/spoolsv/spoolsv.rbuild Modified: trunk/reactos/base/services/spoolsv/spoolsv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] (original) +++ trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] Tue Jan 5 21:32:02 2010 @@ -11,8 +11,10 @@ #define WIN32_NO_STATUS #include <windows.h> -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); + /* GLOBALS ******************************************************************/ @@ -24,6 +26,35 @@ /* FUNCTIONS *****************************************************************/ +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + + if (dwState == SERVICE_RUNNING) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + else if (dwState == SERVICE_PAUSED) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE; + else + 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, @@ -31,17 +62,41 @@ LPVOID lpEventData, LPVOID lpContext) { + TRACE("ServiceControlHandler() called\n"); + switch (dwControl) { case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + 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"); return ERROR_CALL_NOT_IMPLEMENTED; } } - static VOID CALLBACK @@ -50,23 +105,18 @@ UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - DPRINT("ServiceMain() called\n"); + TRACE("ServiceMain() called\n"); ServiceStatusHandle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, ServiceControlHandler, NULL); - /* Service is now running */ - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; - ServiceStatus.dwServiceSpecificExitCode = 0; - ServiceStatus.dwWin32ExitCode = NO_ERROR; - ServiceStatus.dwWaitHint = 0; - ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP; - ServiceStatus.dwCheckPoint = 0; - ServiceStatus.dwCurrentState = SERVICE_RUNNING; - SetServiceStatus(ServiceStatusHandle, &ServiceStatus); - - DPRINT("ServiceMain() done\n"); + TRACE("Calling SetServiceStatus()\n"); + UpdateServiceStatus(SERVICE_RUNNING); + TRACE("SetServiceStatus() called\n"); + + + TRACE("ServiceMain() done\n"); } @@ -82,11 +132,11 @@ UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - DPRINT("Spoolsv: main() started\n"); + TRACE("Spoolsv: main() started\n"); StartServiceCtrlDispatcher(ServiceTable); - DPRINT("Spoolsv: main() done\n"); + TRACE("Spoolsv: main() done\n"); ExitThread(0); Modified: trunk/reactos/base/services/spoolsv/spoolsv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/spoolsv/spoolsv.rbuild [iso-8859-1] Tue Jan 5 21:32:02 2010 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="spoolsv" type="win32cui" installbase="system32" installname="spoolsv.exe" unicode="yes"> <include base="spoolsv">.</include> + <library>wine</library> <library>ntdll</library> <library>advapi32</library> <file>spoolsv.c</file>

14 years, 8 months

[ekohl] 44959: [umpnpmgr] PNP_DeviceInstanceAction: Call a separate function for each action.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jan 5 21:26:31 2010 New Revision: 44959 URL: http://svn.reactos.org/svn/reactos?rev=44959&view=rev Log: [umpnpmgr] PNP_DeviceInstanceAction: Call a separate function for each action. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Tue Jan 5 21:26:31 2010 @@ -1085,50 +1085,102 @@ } +static CONFIGRET +MoveDeviceInstance(LPWSTR pszDeviceInstanceDestination, + LPWSTR pszDeviceInstanceSource) +{ + DPRINT("MoveDeviceInstance: not implemented\n"); + /* FIXME */ + return CR_CALL_NOT_IMPLEMENTED; +} + + +static CONFIGRET +SetupDeviceInstance(LPWSTR pszDeviceInstance, + DWORD ulFlags) +{ + DPRINT("SetupDeviceInstance: not implemented\n"); + /* FIXME */ + return CR_CALL_NOT_IMPLEMENTED; +} + + +static CONFIGRET +EnableDeviceInstance(LPWSTR pszDeviceInstance) +{ + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; + + DPRINT("Enable device instance\n"); + + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + + return ret; +} + + +static CONFIGRET +DisableDeviceInstance(LPWSTR pszDeviceInstance) +{ + DPRINT("DisableDeviceInstance: not implemented\n"); + /* FIXME */ + return CR_CALL_NOT_IMPLEMENTED; +} + + +static CONFIGRET +ReenumerateDeviceInstance(LPWSTR pszDeviceInstance) +{ + DPRINT("ReenumerateDeviceInstance: not implemented\n"); + /* FIXME */ + return CR_CALL_NOT_IMPLEMENTED; +} + + /* Function 29 */ DWORD PNP_DeviceInstanceAction( handle_t hBinding, - DWORD ulMajorAction, - DWORD ulMinorAction, + DWORD ulAction, + DWORD ulFlags, LPWSTR pszDeviceInstance1, LPWSTR pszDeviceInstance2) { CONFIGRET ret = CR_SUCCESS; - NTSTATUS Status; UNREFERENCED_PARAMETER(hBinding); - UNREFERENCED_PARAMETER(ulMinorAction); - UNREFERENCED_PARAMETER(pszDeviceInstance2); DPRINT("PNP_DeviceInstanceAction() called\n"); - switch (ulMajorAction) - { + switch (ulAction) + { + case PNP_DEVINST_MOVE: + ret = MoveDeviceInstance(pszDeviceInstance1, + pszDeviceInstance2); + break; + case PNP_DEVINST_SETUP: - DPRINT("Setup device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; + ret = SetupDeviceInstance(pszDeviceInstance1, + ulFlags); break; case PNP_DEVINST_ENABLE: - { - PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; - DPRINT("Enable device instance\n"); - RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance1); - Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); - if (!NT_SUCCESS(Status)) - ret = NtStatusToCrError(Status); - break; - } + ret = EnableDeviceInstance(pszDeviceInstance1); + break; + + case PNP_DEVINST_DISABLE: + ret = DisableDeviceInstance(pszDeviceInstance1); + break; case PNP_DEVINST_REENUMERATE: - DPRINT("Reenumerate device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; + ret = ReenumerateDeviceInstance(pszDeviceInstance1); break; default: - DPRINT1("Unknown function %lu\n", ulMajorAction); + DPRINT1("Unknown device action %lu: not implemented\n", ulAction); ret = CR_CALL_NOT_IMPLEMENTED; }

14 years, 8 months

[tkreuzer] 44958: [WIN32k] Fix some 64 bit issues.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 21:06:33 2010 New Revision: 44958 URL: http://svn.reactos.org/svn/reactos?rev=44958&view=rev Log: [WIN32k] Fix some 64 bit issues. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Tue Jan 5 21:06:33 2010 @@ -165,7 +165,7 @@ hwnd, pEP->idObject, pEP->idChild, - (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, + (DWORD_PTR)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD)EngGetTickCount(), pEH->Proc); return Result; @@ -202,7 +202,7 @@ if (pEH->head.pti->pEThread != PsGetCurrentThread()) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) + (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess)) { Result = IntCallLowLevelEvent( pEH, Event, @@ -213,7 +213,7 @@ }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) && + NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jan 5 21:06:33 2010 @@ -1136,7 +1136,7 @@ Mod = NULL; Global = FALSE; - if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) + if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR) ThreadId, &Thread))) { DPRINT1("Invalid thread id 0x%x\n", ThreadId); SetLastWin32Error(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Tue Jan 5 21:06:33 2010 @@ -228,7 +228,7 @@ hKl |= 0xe001 << 16; /* FIXME */ else hKl |= hKl << 16; - NewKbl->hkl = (HKL) hKl; + NewKbl->hkl = (HKL)(ULONG_PTR) hKl; NewKbl->klid = LocaleId; NewKbl->Flags = 0; NewKbl->RefCount = 0; @@ -453,7 +453,7 @@ return W32Thread->KeyboardLayout->hkl; } - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Jan 5 21:06:33 2010 @@ -456,7 +456,7 @@ *ScreenPoint = Message->Msg.pt; - if((Window != NULL && (int)Window != 1 && CaptureWindow->hSelf != Window->hSelf) || + if((Window != NULL && PtrToInt(Window) != 1 && CaptureWindow->hSelf != Window->hSelf) || ((FilterLow != 0 || FilterHigh != 0) && (Msg < FilterLow || Msg > FilterHigh))) { /* Reject the message because it doesn't match the filter */ @@ -1374,7 +1374,7 @@ { CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - if ((!Window || (int)Window == 1 || Window->hSelf == CurrentMessage->Msg.hwnd) && + if ((!Window || PtrToInt(Window) == 1 || Window->hSelf == CurrentMessage->Msg.hwnd) && ((MsgFilterLow == 0 && MsgFilterHigh == 0) || (MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message))) @@ -1985,7 +1985,7 @@ Timer = CONTAINING_RECORD(MessageQueue->TimerListHead.Flink, TIMER_ENTRY, ListEntry); EnumEntry = EnumEntry->Flink; - if ((NULL == WndFilter || (int)WndFilter == 1 || Timer->Wnd == WndFilter->hSelf) && + if ((NULL == WndFilter || PtrToInt(WndFilter) == 1 || Timer->Wnd == WndFilter->hSelf) && ((MsgFilterMin == 0 && MsgFilterMax == 0) || (MsgFilterMin <= Timer->Msg && Timer->Msg <= MsgFilterMax))) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jan 5 21:06:33 2010 @@ -492,7 +492,7 @@ if (!((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) break; - if(!(Menu = UserGetMenuObject((HMENU) Wnd->IDMenu))) + if(!(Menu = UserGetMenuObject((HMENU)(DWORD_PTR) Wnd->IDMenu))) break; Menu->MenuInfo.WndOwner = hWnd;

14 years, 8 months

[gedmurphy] 44957: Make the logic easier to read

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jan 5 20:27:14 2010 New Revision: 44957 URL: http://svn.reactos.org/svn/reactos?rev=44957&view=rev Log: Make the logic easier to read Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c Modified: trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop_dependencies.c [iso-8859-1] Tue Jan 5 20:27:14 2010 @@ -47,8 +47,12 @@ dwCurSize = 0; /* Get the list size */ - while (*ptr != L'\0' || *(ptr + 1) != L'\0') - { + while (TRUE) + { + /* Break when we hit the double null */ + if (*ptr == L'\0' && *(ptr + 1) == L'\0') + break; + ptr++; dwCurSize++; }

14 years, 8 months

← Newer
1
...
38
39
40
41
42
43
44
...
53
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 January 2010