Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FLTMC][NFSD] Fix version definition

Browse source 
svn path=/trunk/; revision=75575
This commit is contained in:
Timo Kreuzer 2017-08-16 16:06:41 +00:00
parent 85f9842aab
commit 366d9c7141
4 changed files with 31 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/base/applications/fltmc/CMakeLists.txt
View file

@ -1,4 +1,7 @@
remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
add_definitions(-D_WIN32_WINNT=0x601)
set_cpp(WITH_RUNTIME WITH_EXCEPTIONS)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)

3
reactos/base/applications/fltmc/fltmc.cpp
View file

@ -6,9 +6,6 @@
* PROGRAMMERS: Copyright 2016 Ged Murphy (gedmurphy@gmail.com)
*/
//FIXME
#define NTDDI_VERSION NTDDI_WIN7
// Please leave this temporary hack in place
// it's used to keep VS2015 happy for development.
#ifdef __REACTOS__

4
reactos/base/services/nfsd/CMakeLists.txt
View file

@ -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(

87
reactos/base/services/nfsd/readwrite.c
View file

@ -142,45 +142,27 @@ static int handle_read(nfs41_upcall *upcall)
ULONG pnfs_bytes_read = 0;
int status = NO_ERROR;
#ifdef __REACTOS__
do
{
#endif
nfs41_open_stateid_arg(upcall->state_ref, &stateid);
nfs41_open_stateid_arg(upcall->state_ref, &stateid);
#ifdef PNFS_ENABLE_READ
status = read_from_pnfs(upcall, &stateid);
status = read_from_pnfs(upcall, &stateid);
if (status == NO_ERROR || status == ERROR_HANDLE_EOF)
goto out;
if (status == NO_ERROR || status == ERROR_HANDLE_EOF)
goto out;
if (args->out_len) {
pnfs_bytes_read = args->out_len;
args->out_len = 0;
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;
args->offset += pnfs_bytes_read;
args->buffer += pnfs_bytes_read;
args->len -= pnfs_bytes_read;
}
while (TRUE);
#endif
status = read_from_mds(upcall, &stateid);
args->out_len += pnfs_bytes_read;
out:
return status;
}
@ -296,41 +278,24 @@ static int handle_write(nfs41_upcall *upcall)
uint32_t pnfs_bytes_written = 0;
int status;
#ifdef __REACTOS__
do
{
#endif
nfs41_open_stateid_arg(upcall->state_ref, &stateid);
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;
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;
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;
if (args->len == 0)
goto out;
}
while (TRUE);
#endif
status = write_to_mds(upcall, &stateid);
out:
args->out_len += pnfs_bytes_written;
return status;