[OOPS] That was not meant to be pushed/commited

diff --git a/base/services/nfsd/nfs41_daemon.c b/base/services/nfsd/nfs41_daemon.c
index c2f5df2..1a8f2df 100644 (file)
--- a/base/services/nfsd/nfs41_daemon.c
+++ b/base/services/nfsd/nfs41_daemon.c
@@ -38,8 +38,7 @@
 #include "upcall.h"
 #include "util.h"
 
-//#define MAX_NUM_THREADS 128
-#define MAX_NUM_THREADS 1
+#define MAX_NUM_THREADS 128
 DWORD NFS41D_VERSION = 0;
 
 #ifndef __REACTOS__
@@ -124,7 +123,6 @@ static unsigned int WINAPI thread_main(void *args)
         }
 
         if (upcall.opcode == NFS41_SHUTDOWN) {
-            DbgPrint("Shutdown\n");
             printf("Shutting down..\n");
             exit(0);
         }
@@ -157,7 +155,6 @@ write_downcall:
 #ifndef STANDALONE_NFSD
 VOID ServiceStop()
 {
-   DbgPrint("Setting stop event\n");
    if (stop_event)
       SetEvent(stop_event);
 }
@@ -336,17 +333,8 @@ static int getdomainname()
                             (socklen_t)ptr->ai_addrlen, hostname, NI_MAXHOST, 
                             servInfo, NI_MAXSERV, NI_NAMEREQD);
                 if (status)
-#if 0
                     dprintf(1, "getnameinfo failed %d\n", WSAGetLastError());
                 else {
-#else
-                {
-                    dprintf(1, "getnameinfo failed %d, forcing name\n", WSAGetLastError());
-                    memcpy(hostname, "reactos.home", sizeof("reactos.home"));
-                    status = 0;
-                }
-                {
-#endif
                     size_t i, len = strlen(hostname);
                     char *p = hostname;
                     dprintf(1, "getdomainname: hostname %s %d\n", hostname, len);
@@ -498,8 +486,6 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
     }
 
 #ifndef STANDALONE_NFSD
-    DbgPrint("WaitEvent\n");
-
     stop_event = CreateEvent(NULL, TRUE, FALSE, NULL);
     if (stop_event == NULL)
       goto out_pipe;
@@ -518,7 +504,6 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
     // report the status to the service control manager.
     if (!ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 0))
         goto out_pipe;
-    DbgPrint("Starting wait\n");
     WaitForSingleObject(stop_event, INFINITE);
 #else
     //This can be changed to waiting on an array of handles and using waitformultipleobjects

diff --git a/base/services/nfsd/service.c b/base/services/nfsd/service.c
index 05e8311..51da1a0 100644 (file)
--- a/base/services/nfsd/service.c
+++ b/base/services/nfsd/service.c
@@ -139,8 +139,6 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv)
    if (!sshStatusHandle)
       goto cleanup;
 
-    DbgPrint("Starting service\n");
-
    // SERVICE_STATUS members that don't change in example
    //
    ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
@@ -155,14 +153,8 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv)
                            3000))                 // wait hint
       goto cleanup;
 
-    DbgPrint("Starting service 2\n");
-
-   SetConsoleCtrlHandler( ControlHandler, TRUE );
-
    ServiceStart( dwArgc, lpszArgv );
 
-    DbgPrint("Done\n");
-
    cleanup:
 
    // try to report the stopped status to the service control manager.
@@ -197,8 +189,6 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode)
    // Handle the requested control code.
    //
 
-    DbgPrint("service_ctrl called\n");
-
    switch (dwCtrlCode)
    {
    // Stop the service.
@@ -208,14 +198,9 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode)
    // ServiceStop().  This avoids a race condition
    // which may result in a 1053 - The Service did not respond...
    // error.
-#ifdef __REACTOS__
-   case SERVICE_CONTROL_SHUTDOWN:
-#endif
    case SERVICE_CONTROL_STOP:
-      DbgPrint("for stop\n");
       ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0);
       ServiceStop();
-        DbgPrint("Done\n");
       return;
 
       // Update the service status.
@@ -265,11 +250,7 @@ BOOL ReportStatusToSCMgr(DWORD dwCurrentState,
       if (dwCurrentState == SERVICE_START_PENDING)
          ssStatus.dwControlsAccepted = 0;
       else
-#ifndef __REACTOS__
          ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
-#else
-         ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-#endif
 
       ssStatus.dwCurrentState = dwCurrentState;
       ssStatus.dwWin32ExitCode = dwWin32ExitCode;

diff --git a/dll/win32/ole32/rpc.c b/dll/win32/ole32/rpc.c
index d53287e..bd4611d 100644 (file)
--- a/dll/win32/ole32/rpc.c
+++ b/dll/win32/ole32/rpc.c
@@ -1633,8 +1633,6 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info)
  * IRemUnknown object */
 void RPC_StartRemoting(struct apartment *apt)
 {
-    ERR("Starting remoting: %d %p %p\n", apt->remoting_started, GetCurrentProcessId(), GetCurrentThreadId());
-
     if (!InterlockedExchange(&apt->remoting_started, TRUE))
     {
         WCHAR endpoint[200];

diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c
index ad32135..c85f1bf 100644 (file)
--- a/drivers/filesystems/ntfs/fsctl.c
+++ b/drivers/filesystems/ntfs/fsctl.c
@@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject,
     PIO_STACK_LOCATION Stack;
     PDEVICE_EXTENSION DeviceExt;
 
-    DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
+    DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
     DeviceExt = DeviceObject->DeviceExtension;
@@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext)
     PIRP Irp;
     PDEVICE_OBJECT DeviceObject;
 
-    DPRINT("NtfsFileSystemControl() called\n");
+    DPRINT1("NtfsFileSystemControl() called\n");
 
     DeviceObject = IrpContext->DeviceObject;
     Irp = IrpContext->Irp;

diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt
index 0f289ef..5ea4b08 100644 (file)
--- a/modules/rosapps/applications/devutils/CMakeLists.txt
+++ b/modules/rosapps/applications/devutils/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(createspec)
 add_subdirectory(gdb2)
 add_subdirectory(gdihv)
 add_subdirectory(genguid)
-add_subdirectory(ioctlbf)
 add_subdirectory(nls2txt)
 add_subdirectory(shimdbg)
 add_subdirectory(shlextdbg)