[ros-diffs] [tkreuzer] 75575: [FLTMC][NFSD] Fix version definition

Author: tkreuzer
Date: Wed Aug 16 16:06:41 2017
New Revision: 75575

URL: http://svn.reactos.org/svn/reactos?rev=75575&view=rev
Log:
[FLTMC][NFSD] Fix version definition

Modified:
    trunk/reactos/base/applications/fltmc/CMakeLists.txt
    trunk/reactos/base/applications/fltmc/fltmc.cpp
    trunk/reactos/base/services/nfsd/CMakeLists.txt
    trunk/reactos/base/services/nfsd/readwrite.c

Modified: trunk/reactos/base/applications/fltmc/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/CMa...
==============================================================================
--- trunk/reactos/base/applications/fltmc/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fltmc/CMakeLists.txt	[iso-8859-1] Wed Aug 16 16:06:41 2017
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
+add_definitions(-D_WIN32_WINNT=0x601)

set_cpp(WITH_RUNTIME WITH_EXCEPTIONS)

Modified: trunk/reactos/base/applications/fltmc/fltmc.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/flt...
==============================================================================
--- trunk/reactos/base/applications/fltmc/fltmc.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fltmc/fltmc.cpp	[iso-8859-1] Wed Aug 16 16:06:41 2017
@@ -5,9 +5,6 @@
 * PURPOSE:     Control utility for file system filter drivers
 * PROGRAMMERS: Copyright 2016 Ged Murphy ([e-mail])
 */
-
-//FIXME
-#define NTDDI_VERSION NTDDI_WIN7

// Please leave this temporary hack in place
 // it's used to keep VS2015 happy for development.

Modified: trunk/reactos/base/services/nfsd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/CMakeLis...
==============================================================================
--- trunk/reactos/base/services/nfsd/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/services/nfsd/CMakeLists.txt	[iso-8859-1] Wed Aug 16 16:06:41 2017
@@ -1,5 +1,5 @@
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
+remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
+add_definitions(-D_WIN32_WINNT=0x601)
 add_definitions(-DNTDDI_VERSION=0x06010000)

include_directories(

Modified: trunk/reactos/base/services/nfsd/readwrite.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/nfsd/readwrit...
==============================================================================
--- trunk/reactos/base/services/nfsd/readwrite.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/nfsd/readwrite.c	[iso-8859-1] Wed Aug 16 16:06:41 2017
@@ -142,45 +142,27 @@
     ULONG pnfs_bytes_read = 0;
     int status = NO_ERROR;

-#ifdef __REACTOS__
-    do
-    {
+    nfs41_open_stateid_arg(upcall->state_ref, &stateid);
+
+#ifdef PNFS_ENABLE_READ
+    status = read_from_pnfs(upcall, &stateid);
+
+    if (status == NO_ERROR || status == ERROR_HANDLE_EOF)
+        goto out;
+
+    if (args->out_len) {
+        pnfs_bytes_read = args->out_len;
+        args->out_len = 0;
+
+        args->offset += pnfs_bytes_read;
+        args->buffer += pnfs_bytes_read;
+        args->len -= pnfs_bytes_read;
+    }
 #endif
-        nfs41_open_stateid_arg(upcall->state_ref, &stateid);
-
-#ifdef PNFS_ENABLE_READ
-        status = read_from_pnfs(upcall, &stateid);
-
-        if (status == NO_ERROR || status == ERROR_HANDLE_EOF)
-            goto out;
-
-        if (args->out_len) {
-            pnfs_bytes_read = args->out_len;
-            args->out_len = 0;
-
-            args->offset += pnfs_bytes_read;
-            args->buffer += pnfs_bytes_read;
-            args->len -= pnfs_bytes_read;
-        }
-#endif
-
-        status = read_from_mds(upcall, &stateid);
-#ifdef __REACTOS__
-        /* Status returned by NFS server when session is to be renewed */
-        if (status == 1006)
-        {
-            nfs41_session_renew(upcall->state_ref->session);
-            dprintf(1, "Session renewed (read)!\n");
-            continue;
-        }
-#endif
-
-        args->out_len += pnfs_bytes_read;
-#ifdef __REACTOS__
-        break;
-    }
-    while (TRUE);
-#endif
+
+    status = read_from_mds(upcall, &stateid);
+
+    args->out_len += pnfs_bytes_read;
 out:
     return status;
 }
@@ -296,41 +278,24 @@
     uint32_t pnfs_bytes_written = 0;
     int status;

-#ifdef __REACTOS__
-    do
-    {
+    nfs41_open_stateid_arg(upcall->state_ref, &stateid);
+
+#ifdef PNFS_ENABLE_WRITE
+    status = write_to_pnfs(upcall, &stateid);
+    if (args->out_len) {
+        pnfs_bytes_written = args->out_len;
+        args->out_len = 0;
+
+        args->offset += pnfs_bytes_written;
+        args->buffer += pnfs_bytes_written;
+        args->len -= pnfs_bytes_written;
+
+        if (args->len == 0)
+            goto out;
+    }
 #endif
-        nfs41_open_stateid_arg(upcall->state_ref, &stateid);
-
-#ifdef PNFS_ENABLE_WRITE
-        status = write_to_pnfs(upcall, &stateid);
-        if (args->out_len) {
-            pnfs_bytes_written = args->out_len;
-            args->out_len = 0;
-
-            args->offset += pnfs_bytes_written;
-            args->buffer += pnfs_bytes_written;
-            args->len -= pnfs_bytes_written;
-
-            if (args->len == 0)
-                goto out;
-        }
-#endif
-
-        status = write_to_mds(upcall, &stateid);
-#ifdef __REACTOS__
-        /* Status returned by NFS server when session is to be renewed */
-        if (status == 1006)
-        {
-            nfs41_session_renew(upcall->state_ref->session);
-            dprintf(1, "Session renewed (write)!\n");
-            continue;
-        }
-
-        break;
-    }
-    while (TRUE);
-#endif
+
+    status = write_to_mds(upcall, &stateid);
 out:
     args->out_len += pnfs_bytes_written;
     return status;