Changeset 401 for branches/client-1.6/src

Timestamp:

Jan 29, 2010, 1:51:25 PM (16 years ago)

Author:

Silvan Scherrer

Message:

added all remaining changes from 1.5.0 client

Location:

branches/client-1.6/src

Files:

• BuildAll.cmd (added)
• Config.km_ (modified) (1 diff)
• Makefile.kmk (modified) (7 diffs)
• help (added)
• help/ndpsmb.ipf (added)
• help/ndpsmb_fr.ipf (added)
• help/readme.txt (added)
• help/readme_de.txt (added)
• help/readme_fr.txt (added)
• instpl.cmd (deleted)
• ndpsmb.c (modified) (4 diffs)
• ndpsmb.ndp (deleted)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.ipf (deleted)
• rc/rc.rc (modified) (4 diffs)
• readme.txt (deleted)
• resources (added)
• resources/instpl.cmd (added)
• resources/ndpsmb.ndp (added)
• resources/ndpsmb.wis_ (added)
• smbwrp.c (modified) (1 diff)
• version.h_ (added)

branches/client-1.6/src/Config.km_

@@ -9 +9 @@
 # in bldlevel informations
 #
-VERSION = 1.6.beta1
+VERSION = 1.6.0
 BUILD   = beta
-SAMBA   = ../../samba-3.3.x
+SAMBA   = ../../samba-33
 TOOLKIT = u:/os2tk45

branches/client-1.6/src/Makefile.kmk

@@ -19 +19 @@
 DLLS = ndpsmb
 
+# required to get IPFC compiler to work correctly
+export IPFC=$(TOOLKIT)\IPFC
+
 ndpsmb_RCTOOL =OPENWATCOM
 TOOL_OPENWATCOM_RCFLAGS += -i=$(TOOLKIT)/h
@@ -32 +35 @@
 
 ndpsmb_CFLAGS = -Zomf
-ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium4
+# YD -O2/O3 triggers stack variable alignment bug in gcc 4.3.2/4.4.0!
+ndpsmb_CFLAGS.release = -g -O1 -march=pentium -mtune=pentium4
+# SCS when building with gcc 3.3.5 use the below cflags
+#ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium3
 ndpsmb_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
 ndpsmb_LDFLAGS = -Zomf -Zno-fork -Zmap -Zbin-files
@@ -46 +52 @@
                 $(SAMBA)/source/lib/talloc \
                 $(SAMBA)/source/librpc \
-                $(SAMBA)/source/lib/tdb/include \
+                $(SAMBA)/source/tdb/include \
                 $(GCC_INC)
 
@@ -56 +62 @@
 
 #build other files (e.g. help)
-OTHERS = /rc/rc.ipf $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
-OTHER_CLEAN = $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
+OTHERS = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_BIN)/readme.txt \
+         $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_BIN)/readme_fr.txt
+OTHER_CLEAN = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/readme.txt \
+              $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/readme_fr.txt
 
 
@@ -63 +71 @@
 INSTALLS = ndpsmb-docs
 ndpsmb-docs_INST = bin/
-ndpsmb-docs_SOURCES = $(SAMBA)/COPYING=>COPYING ndpsmb.ndp instpl.cmd
+ndpsmb-docs_SOURCES = $(SAMBA)/COPYING=>COPYING resources/ndpsmb.ndp resources/instpl.cmd
 OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd 
 
@@ -69 +77 @@
 # packaging stuffs
 ifeq ($(BUILD_TYPE),debug)
-  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)-debug.zip
+  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)-debug
 else
-  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD).zip
+  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)
 endif
-PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME)
-OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME) 
+PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
+PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
+OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
+OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
 
 # now include standard code
@@ -90 +100 @@
         @BldLevelInf0.cmd $(VERSION) $(BUILD)
 
-# substitute macros in ipf file
-/rc/rc.ipf: Config.kmk ./rc/rc.ipf
-        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./rc/rc.ipf \
+# compile help file
+$(PATH_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf version.h Config.kmk
+        -@mkdir $(PATH_OBJ)
+        -@mkdir $(PATH_OBJ)\en
+        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/en/ndpsmb.ipf /other /WarningsRc:0
+        -@mkdir $(PATH_BIN)
+        -@mkdir $(PATH_BIN)\en
+        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
+
+$(PATH_BIN)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf version.h Config.kmk
+        -@mkdir $(PATH_OBJ)
+        -@mkdir $(PATH_OBJ)\fr
+        @ppwizard.cmd ./help/ndpsmb_fr.ipf /Pack:N /output:$(PATH_OBJ)/fr/ndpsmb.ipf /other /WarningsRc:0
+        -@mkdir $(PATH_BIN)
+        -@mkdir $(PATH_BIN)\fr
+        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
+
+
+# substitute macros in version.h
+version.h: Config.kmk version.h_
+        $(SED) "s;_VERSION_;$(VERSION);g" version.h_ \
+                | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \
-                > rc.ipf
-
-# compile help file
-$(PATH_BIN)/ndpsmb.hlp: rc.ipf ./rc/rc.h ./H/hmacros.h config.kmk
-        -gcc -E -I./h -I./rc -x c rc.ipf > rc.i
-        -@mkdir $(PATH_BIN)
-        $(TOOLKIT)\bin\ipfc.exe rc.i $(PATH_BIN)/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
-        rm rc.i
-        rm rc.ipf
+                > version.h
 
 # substitute macros in docs
-$(PATH_BIN)/readme.txt: Config.kmk readme.txt
-        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" readme.txt \
+$(PATH_BIN)/readme.txt: Config.kmk ./help/readme.txt
+        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./help/readme.txt \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \
                 > $(PATH_BIN)/readme.txt
+
+$(PATH_BIN)/readme_fr.txt: Config.kmk ./help/readme_fr.txt
+        $(QUIET)$(SED) "s;_VERSION_;$(VERSION);g" ./help/readme_fr.txt \
+                | $(SED) "s;_BUILD_;$(BUILD);g" \
+                > $(PATH_BIN)/readme_fr.txt
 
 # final: zip all files!
 $(PATH_ROOT)/dist/$(PACKAGE_NAME): \
                 $(PATH_BIN)/ndpsmb.dll \
-                $(PATH_BIN)/ndpsmb.hlp \
-                $(PATH_BIN)/readme.txt
+                $(PATH_BIN)/en/ndpsmb.hlp \
+                $(PATH_BIN)/fr/ndpsmb.hlp \
+                $(PATH_BIN)/readme.txt \
+                $(PATH_BIN)/readme_fr.txt
         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                              
         $(QUIET)$(RM) -f $@
         $(QUIET)zip -9 -j $@ $(PATH_BIN)/* 
 
+# final2: wpi all files!
+$(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
+                ./resources/ndpsmb.wis_ \
+                $(PATH_BIN)/ndpsmb.dll \
+                $(PATH_BIN)/en/ndpsmb.hlp \
+                $(PATH_BIN)/fr/ndpsmb.hlp \
+                $(PATH_BIN)/readme.txt \
+                $(PATH_BIN)/readme_fr.txt 
+        $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                              
+        $(QUIET)$(RM) -f $@
+        @ppwizard.cmd resources/ndpsmb.wis_ /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
+        $(QUIET)$(REDIRECT) -C $(PATH_BIN)/en -- runwic.cmd $(subst /,\\,$@) -a 2 -r "*"
+        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"

branches/client-1.6/src/ndpsmb.c

@@ -207 +207 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        { ND_PROP_ULONG, 0, "MEMLEN", "2"},
-        {ND_PROP_STRING, 0, "LOGFILE", ""},
-        { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
@@ -389 +386 @@
 
         pRes->rootlevel = 0;
-        *pRes->logfile = 0;
-        pRes->loglevel = 0;
         pRes->easupport = 1;
 #ifdef HAVE_KRB5_H
@@ -474 +469 @@
         }
 
-        t = 0, q = NULL;
-        rc = ph->fsphQueryStringProperty (properties, "LOGFILE", &q, &t);
-        if (!rc && t && *q)
-        {
-                StrNCpy(pRes->logfile, q, sizeof(pRes->logfile) - 1);
-        }
-
-        t = 0;
-        rc = ph->fsphQueryUlongProperty (properties, "LOGLEVEL", &t);
-        if (!rc)
-        {
-                if (t > 9)
-                {
-                        t = 9;
-                        rc = ERROR_INVALID_PARAMETER;
-                }
-                pRes->loglevel = t;
-        }
-
         t = 0;
         rc = ph->fsphQueryUlongProperty (properties, "MASTERTYPE", &t);
@@ -520 +496 @@
                 }
         }
-
-#if 0
-        t = 0;
-        rc = ph->fsphQueryUlongProperty (properties, "MEMLEN", &t);
-        if (!rc)
-        {
-                if (t <= (pRes->easupport ? 1 : 0) || t > 10)
-                {
-                        rc = ERROR_INVALID_PARAMETER;
-                }
-                else
-                {
-                        pRes->memlen = t * 65536;
-                }
-        }
-#endif
 
         return rc;

branches/client-1.6/src/rc/rc.dlg

@@ -30 +30 @@
                         WS_VISIBLE
         ENTRYFIELD      "", ENT_MASTER, 147, 33, 90, 8, ES_MARGIN
-        LTEXT           "Memory buffer:", LBL_MEMLEN, 253, 135, 10, 10, 
-                        DT_BOTTOM | NOT WS_VISIBLE
-        CONTROL         "", CMB_MEMLEN, 251, 98, 13, 11, WC_COMBOBOX, 
-                        CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP
-        LTEXT           "Logfile:", LBL_LOGFILE, 251, 124, 11, 10, DT_BOTTOM | 
-                        NOT WS_VISIBLE
-        ENTRYFIELD      "", ENT_LOGFILE, 254, 112, 7, 8, ES_MARGIN | NOT 
-                        WS_VISIBLE
-        LTEXT           "Loglevel:", LBL_LOGLEVEL, 251, 131, 13, 10, 
-                        DT_BOTTOM | NOT WS_VISIBLE
-        SPINBUTTON      CMB_LOGLEVEL, 252, 12, 8, 35, SPBS_NUMERICONLY | 
-                        SPBS_MASTER | SPBS_JUSTRIGHT | WS_GROUP | NOT 
-                        WS_VISIBLE
         LTEXT           "Supports EA", LBL_EASUPPORT, 195, 104, 52, 10, 
                         DT_WORDBREAK

branches/client-1.6/src/rc/rc.h

@@ -15 +15 @@
 #define ENT_MASTER                  1012
 #define CMB_MASTER                  1013
-#define LBL_MEMLEN                  1014
-#define CMB_MEMLEN                  1015
 #define LBL_PROP                    1016
-#define LBL_LOGFILE                 1017
-#define ENT_LOGFILE                 1018
-#define LBL_LOGLEVEL                1019
-#define CMB_LOGLEVEL                1020
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022

branches/client-1.6/src/rc/rc.rc

@@ -34 +34 @@
    "Help for command line utility:\r\n"
    "\r\n"
-   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;memlen=...;logfile=...;loglevel=...;easupport=...\r\n"
+   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;easupport=...\r\n"
    "\r\n"
    "    workgroup - name of workgroup\r\n"
@@ -43 +43 @@
    "    master - name of master server or master workgroup\r\n"
    "    mastertype - 0 if 'master' is the name of master server, 1 if 'master' is the name of master workgroup\r\n"
-   "    memlen - the size of shared memory buffer allocated for every NDFS connection in size of 64k blocks\r\n"
-   "    logfile - file to log records from smbcd.exe. Used only if smbcd.exe is run by ndpsmb.dll plugin, not manually\r\n"
-   "    loglevel - level of logging (0-9) for smbcd.exe. Used only if smbcd.exe is run by ndpsmb.dll plugin, not manually\r\n"
    "    easupport - 0 to not support EA, 1 to support\r\n"
    "\r\n"
@@ -103 +100 @@
 RCDATA (DLG_ID + 7)
 {
-    CMB_MEMLEN, PARMTYPE_INT, 1L, 10L, "memlen", "%d", 2L, 
-    "64k", 
-    "128k", 
-    "192k", 
-    "256k", 
-    "320k", 
-    "384k", 
-    "448k", 
-    "512k", 
-    "576k", 
-    "640k"
-}
-
-RCDATA (DLG_ID + 8)
-{
-    ENT_LOGFILE, PARMTYPE_STRING, 1L, 256L, "logfile", "%s", ""
-}
-
-RCDATA (DLG_ID + 9)
-{
-    CMB_LOGLEVEL, PARMTYPE_INT, 0L, 9L, "loglevel", "%d", 0L, 
-    "0", 
-    "1",
-    "2",
-    "3",
-    "4",
-    "5",
-    "6",
-    "7",
-    "8",
-    "9"
-}
-
-RCDATA (DLG_ID + 10)
-{
     CHK_EASUPPORT, PARMTYPE_INT, 0L, 1L, "easupport", "%d", 1L, 
     "0", 
@@ -143 +105 @@
 }
     
-RCDATA (DLG_ID + 11)
+RCDATA (DLG_ID + 8)
 {
     ENT_SPASS, PARMTYPE_STRING, 1L, 255L, "spassword", "%s", ""
 }
 
-RCDATA (DLG_ID + 12)
+RCDATA (DLG_ID + 9)
 {
     1

branches/client-1.6/src/smbwrp.c

@@ -1759 +1759 @@
         return 0;
 }
+