From: Andrei Keis Date: Wed, 27 Nov 2002 03:22:38 +0000 (+0000) Subject: windows-updates-20021104 X-Git-Tag: openafs-devel-1_3_50~487 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=12867ce0b64abb2095d8911b7bac1cf6e4460290;p=packages%2Fo%2Fopenafs.git windows-updates-20021104 windows timestamp update ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== build updates --- diff --git a/src/WINNT/afsapplib/NTMakefile b/src/WINNT/afsapplib/NTMakefile index c19d74065..44ef0a61f 100644 --- a/src/WINNT/afsapplib/NTMakefile +++ b/src/WINNT/afsapplib/NTMakefile @@ -5,10 +5,6 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# make compiler warnings fatal - -AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -WX - # indicate that the functions in this library should be exported AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -DEXPORT_AFSAPPLIB -DEXPORTED=_declspec(dllexport) diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c index 42979d5c9..bea7bad32 100644 --- a/src/WINNT/afsd/afsd_service.c +++ b/src/WINNT/afsd/afsd_service.c @@ -281,7 +281,7 @@ void main() return ; } #else -void _CRTAPI1 main() +void main() { LONG status = ERROR_SUCCESS; SERVICE_TABLE_ENTRY dispatchTable[] = { diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c index f09e9fcc6..ed5b789e6 100644 --- a/src/WINNT/afsd/cm_config.c +++ b/src/WINNT/afsd/cm_config.c @@ -242,7 +242,11 @@ long cm_SearchCellFile(char *cellNamep, char *newCellNamep, } valuep++; /* skip the "#" */ - valuep += strspn(valuep, " "); /* skip SP & TAB */ + valuep += strspn(valuep, " \t"); /* skip SP & TAB */ + /* strip spaces and tabs in the end. They should not be there according to CellServDB format + so do this just in case */ + while (valuep[strlen(valuep) - 1] == ' ' || valuep[strlen(valuep) - 1] == '\t') valuep[strlen(valuep) - 1] = '\0'; + #endif /* !DJGPP */ if (inRightCell) { #if !defined(DJGPP) && !defined(AFS_WIN95_ENV) diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c index 0f7406032..3b326022e 100644 --- a/src/WINNT/afsd/cm_conn.c +++ b/src/WINNT/afsd/cm_conn.c @@ -63,9 +63,9 @@ long cm_GetServerList(struct cm_fid *fidp, struct cm_user *userp, struct cm_req *reqp, cm_serverRef_t **serverspp) { long code; - cm_volume_t *volp; - cm_serverRef_t *serversp; - cm_cell_t *cellp; + cm_volume_t *volp = NULL; + cm_serverRef_t *serversp = NULL; + cm_cell_t *cellp = NULL; if (!fidp) { *serverspp = NULL; diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index ef4e7e2b8..98ddb0947 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -1447,13 +1447,18 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet /* prepare for setattr call */ attr.mask = 0; + lastMod = *((FILETIME *)(p->datap + 16)); - if (LargeIntegerNotEqualToZero(*((LARGE_INTEGER *)&lastMod))) { + /* when called as result of move a b, lastMod is (-1, -1). If the check for -1 is not present, timestamp + of the resulting file will be 1969 (-1) + */ + if (LargeIntegerNotEqualToZero(*((LARGE_INTEGER *)&lastMod)) && lastMod.dwLowDateTime != -1 && lastMod.dwHighDateTime != -1) { attr.mask |= CM_ATTRMASK_CLIENTMODTIME; smb_UnixTimeFromLargeSearchTime(&attr.clientModTime, &lastMod); fidp->flags |= SMB_FID_MTIMESETDONE; } + attribute = *((u_long *)(p->datap + 32)); if (attribute != 0) { if ((scp->unixModeBits & 0222) diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile index fc20442dd..0d1d17610 100644 --- a/src/WINNT/client_config/NTMakefile +++ b/src/WINNT/client_config/NTMakefile @@ -5,10 +5,6 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html -# make compiler warnings fatal - -AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -WX - # include the AFSD source tree on our inclusion path AFSDEV_AUXCDEFINES = $(AFSDEV_AUXCDEFINES) -I ..\afsd diff --git a/src/WINNT/client_exp/NTMakefile b/src/WINNT/client_exp/NTMakefile index 31bf42b00..e142fc8c8 100644 --- a/src/WINNT/client_exp/NTMakefile +++ b/src/WINNT/client_exp/NTMakefile @@ -57,7 +57,7 @@ DLLLIBS =\ $(DESTDIR)\lib\afs\TaLocale.lib $(DLLFILE): $(DLLOBJS) - $(DLLMFCLINK) /def:afs_shl_ext.def $(DLLLIBS) + $(DLLCONLINK) /def:afs_shl_ext.def $(DLLLIBS) $(DLLPREP) ############################################################################ diff --git a/src/WINNT/eventlog/lang/NTMakefile b/src/WINNT/eventlog/lang/NTMakefile index 7c8894c3f..6b176a86b 100644 --- a/src/WINNT/eventlog/lang/NTMakefile +++ b/src/WINNT/eventlog/lang/NTMakefile @@ -40,7 +40,7 @@ EVENTRESFILE = $(LANGNAME)\event.res DLLOBJS = $(DLLRESFILE) $(DLLFILE): $(DLLOBJS) - $(DLLCONLINK) + $(DLLRESLINK) $(DLLPREP) ############################################################################ diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 43f278963..c3f9622d0 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -11,7 +11,6 @@ # AFSDEV_BUILDTYPE = [ CHECKED | FREE ] # AFSDEV_INCLUDE = # AFSDEV_LIB = -# AFSDEV_BIN = # # Optional definitions: # AFSDEV_DESTDIR = (default is $(AFSROOT)\DEST) @@ -37,7 +36,7 @@ APPVER = 4.0 !ENDIF #define used in WinNT/2000 installation and program version display -AFSPRODUCT_VERSION=1.2.2 b +AFSPRODUCT_VERSION=1.2.6 a CELLNAME_DEFAULT=Your Cell Name CELLSERVDB_INSTALL=CellServDB.GrandCentral CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB @@ -63,40 +62,26 @@ AFSDEV_BUILDTYPE = NONE # Limit default include and library directories to those specified for build. -!IFNDEF AFSDEV_INCLUDE -!ERROR Must define AFSDEV_INCLUDE to be the default include directories. -!ENDIF +#!IFNDEF AFSDEV_INCLUDE +#!ERROR Must define AFSDEV_INCLUDE to be the default include directories. +#!ENDIF -!IF ((!DEFINED(INCLUDE)) && ([set INCLUDE=$(AFSDEV_INCLUDE)] != 0)) +#!IF ((!DEFINED(INCLUDE)) && ([set INCLUDE=$(AFSDEV_INCLUDE)] != 0)) # If env. var. INCLUDE not defined then macro assignment won't set it. -!ERROR Failed setting environment variable INCLUDE. -!ENDIF -INCLUDE = $(AFSDEV_INCLUDE) +#!ERROR Failed setting environment variable INCLUDE. +#!ENDIF +#INCLUDE = $(AFSDEV_INCLUDE) -!IFNDEF AFSDEV_LIB -!ERROR Must define AFSDEV_LIB to be the default library directories. -!ENDIF +#!IFNDEF AFSDEV_LIB +#!ERROR Must define AFSDEV_LIB to be the default library directories. +#!ENDIF -!IF ((!DEFINED(LIB)) && ([set LIB=$(AFSDEV_LIB)] != 0)) +#!IF ((!DEFINED(LIB)) && ([set LIB=$(AFSDEV_LIB)] != 0)) # If env. var. LIB not defined then macro assignment won't set it. -!ERROR Failed setting environment variable LIB. -!ENDIF -LIB = $(AFSDEV_LIB) - - -# Put default build binary directories at front of path. - -!IFNDEF AFSDEV_BIN -!ERROR Must define AFSDEV_BIN to be the default build binary directories. -!ENDIF - -!IF ((!DEFINED(PATH)) && ([set PATH=$(AFSDEV_BIN)] != 0)) -# If env. var. PATH not defined then macro assignment won't set it. -!ERROR Failed setting environment variable PATH. -!ENDIF -PATH = $(AFSDEV_BIN);$(PATH) - +#!ERROR Failed setting environment variable LIB. +#!ENDIF +#LIB = $(AFSDEV_LIB) # Undefine WIN32.MAK NODEBUG macro. # Always generate full debug info, unless profiling or tuning (see below). @@ -104,11 +89,9 @@ PATH = $(AFSDEV_BIN);$(PATH) !UNDEF NODEBUG # Include WIN32.MAK nmake file - !INCLUDE - # Extend and/or supplement definitions in WIN32.MAK. # Standard install directory. @@ -183,13 +166,15 @@ afscflags =\ !IF ("$(AFSDEV_BUILDTYPE)" == "FREE") # Apply full optimization; generate full debug info in obj. -afscflags = $(afscflags) /Ox /Z7 -ldebug = $(ldebug) -debugtype:both +afscflags = $(afscflags) /Ox /Zi +# ldebug = $(ldebug) -debugtype:both +ldebug = $(ldebug) cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025) +cvarsdll = $(cvarsdll:-MDd=-MD) !ELSEIF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") # Disable optimization; generate full debug info in obj. -afscflags = $(afscflags) /Od /Z7 +afscflags = $(afscflags) /Od /Zi ldebug = $(ldebug) -debugtype:both !ENDIF @@ -215,14 +200,14 @@ afscflags = $(afscflags) /W$(AFSDEV_WARNLEVEL) # /FIXED:NO generates a relocation section in the executable afslflags =\ - /FIXED:NO + /FIXED:NO /VERBOSE:LIB /DEBUG # For checked builds, define DEBUG (but not the MS control flag _DEBUG). !IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED") -afscdefs = $(afscdefs) -DDEBUG +#afscdefs = $(afscdefs) -DDEBUG !ENDIF # Utilize the debug version of the MSVC runtime, if requested. diff --git a/src/config/NTMakefile.i386_win95 b/src/config/NTMakefile.i386_win95 index 13799adf9..1ae59ca48 100644 --- a/src/config/NTMakefile.i386_win95 +++ b/src/config/NTMakefile.i386_win95 @@ -11,7 +11,6 @@ # AFSDEV_BUILDTYPE = [ CHECKED | FREE ] # AFSDEV_INCLUDE = # AFSDEV_LIB = -# AFSDEV_BIN = # # Optional definitions: # AFSDEV_DESTDIR = (default is $(AFSROOT)\DEST) @@ -94,20 +93,6 @@ INCLUDE = $(AFSDEV_INCLUDE) !ENDIF LIB = $(AFSDEV_LIB) - -# Put default build binary directories at front of path. - -!IFNDEF AFSDEV_BIN -!ERROR Must define AFSDEV_BIN to be the default build binary directories. -!ENDIF - -!IF ((!DEFINED(PATH)) && ([set PATH=$(AFSDEV_BIN)] != 0)) -# If env. var. PATH not defined then macro assignment won't set it. -!ERROR Failed setting environment variable PATH. -!ENDIF -PATH = $(AFSDEV_BIN);$(PATH) - - # Undefine WIN32.MAK NODEBUG macro. # Always generate full debug info, unless profiling or tuning (see below). @@ -302,7 +287,8 @@ DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll) $ DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $** # DLL link macro for resource-only DLLs -DLLRESLINK = $(link) /OUT:$@ $(dlllflags:-entry:_DllMainCRTStartup@12=-noentry) $(afslflags) $** +# DLLRESLINK = $(link) /OUT:$@ $(dlllflags:-entry:_DllMainCRTStartup@12=-noentry) $(afslflags) $** +DLLRESLINK = $(link) /OUT:$@ -noentry $(afslflags) $** # Library archive macro LIBARCH = $(implib) /NOLOGO /OUT:$@ $** diff --git a/src/ntbuild.bat b/src/ntbuild.bat index 7ade68e64..9573a251f 100755 --- a/src/ntbuild.bat +++ b/src/ntbuild.bat @@ -54,12 +54,14 @@ set AFSBLD_IS_WSPP=1 goto args_done + :args_done REM ######################################################################## REM General required definitions: REM SYS_NAME = AFS system name SET SYS_NAME=i386_win95 +SET SYS_NAME=i386_nt40 SET _WIN32_IE=0x400 REM ########################################################################