Conference smurf::buildhelp

2488.0. "bdiff problem with v32supportx.nightly pool" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Fri Aug 23 1996 16:22

Date Of Receipt: 	13-AUG-1996 17:38:00.78
From: 	FLUME::"jenny@locus_ode.wdec.platsol.com" "13-Aug-1996 1740"
To: 	[email protected]
CC: 	jenny@locus_ode.wdec.platsol.com, [email protected]
Subj: 	bdiff problem with v32supportx.nightly pool

Hi,

I tried to checkin a fix for CLD USG-00477 into 
v32supportx.nightly (lib/Xm/TextF.c), and bdiff 
gave me two fixes, one from my last checkin
on 4/29/96 (Rev.1.1.30.2) and the one for CLD
USG-00477 as follow:

                bdiff -r$NEW -all -c >& bdiff.log

[ ./motif/lib/Xm/TextF.c ]
===================================================================
RCS file: ./motif/lib/Xm/TextF.c,v
retrieving revision 1.1.19.4
diff -c -r1.1.19.4 OdeSrvrTmpJenny_Vu016435/TextF.c
*** 1.1.19.4    1994/11/04 21:31:34
--- OdeSrvrTmpJenny_Vu016435/TextF.c    1996/08/13 19:03:10
***************
*** 4,13 ****
  /*
   * HISTORY
   * $Log: TextF.c,v $
   * Revision 1.1.19.4  1994/11/04  21:31:34  Susan_Monnelly
   *    latest set of bug fixes
   *    [1994/11/04  21:10:00  Susan_Monnelly]
!  *
   * Revision 1.1.19.3  1994/10/13  20:43:47  Richard_June
   *    Latest set of bug fixes
   *    [1994/10/13  19:43:11  Richard_June]
--- 4,24 ----
  /*
   * HISTORY
   * $Log: TextF.c,v $
+  * Revision 1.1.35.2  1996/08/13  19:00:43  Jenny_Vu
+  *    Fixed MOTIF_BUGS 220 by Sam Wang.  Reg: CLD USG-00477, OSF_QAR SS 46604
+  *    Fixed Motif corrupted Text Field widget pointer.
+  *
+  * Revision 1.1.30.2  1996/04/29  17:53:25  Jenny_Vu
+  *    03-Apr-1996
+  *    Fixed CFS.23345 (CLD MGO101106) and CFS.39769 (CLD GOZ100507)
+  *    by Sam Menaker.  Incorrect deletion of characters in overstrike
+  *    mode in XmTextField widgets.
+  *    [1996/04/24  00:25:03  Jenny_Vu]
+  *
   * Revision 1.1.19.4  1994/11/04  21:31:34  Susan_Monnelly
   *    latest set of bug fixes
   *    [1994/11/04  21:10:00  Susan_Monnelly]
!  *
   * Revision 1.1.19.3  1994/10/13  20:43:47  Richard_June
   *    Latest set of bug fixes
   *    [1994/10/13  19:43:11  Richard_June]
***************
*** 108,114 ****
  */
  #ifdef REV_INFO
  #ifndef lint
! static char rcsid[] = "$RCSfile: TextF.c,v $ $Revision: 1.1.19.4 $ $Date: 1994
/11/04 21:31:34 $"
  #endif
  #endif
  /*
--- 119,125 ----
  */
  #ifdef REV_INFO
  #ifndef lint
! static char rcsid[] = "$RCSfile: TextF.c,v $ $Revision: 1.1.35.2 $ $Date: 1996
/08/13 19:00:43 $"
  #endif
  #endif
  /*
***************
*** 5094,5100 ****
--- 5105,5126 ----
              n_compseq = TextFieldCountSpacingChar(tf, insert_buffer,
                                                    insert_length);
              for (i=0 ; i < n_compseq ; i++)
+ #ifdef DEC_MOTIF_BUG_FIX
+ /* DEC_MOTIF_BUG_FIX
+  *
+  * Part 1 of 1
+  * Additional parts:  None
+  * Reference:   IPMT CFS.39769 (CLD GOZ100507)
+  * Fixed by:    Jennifer Vu
+  * Date:        03-Apr-1996
+  *
+  * Description: nextPos should remain the same
+  *
+  */
+               TextFieldScanCompositeBreak( tf, nextPos, XmTEXT_FORWARD,
+ #else
                  TextFieldScanCompositeBreak( tf, nextPos + 1, XmTEXT_FORWARD,
+ #endif        /* DEC_MOTIF_BUG_FIX */
                                               &nextPos );
          }
  #else
***************
*** 11526,11531 ****
--- 11552,11576 ----
      if (!redisplay && redisplay_text)
        RedisplayText(new_tf, 0, new_tf->text.string_length);

+ #ifdef DEC_MOTIF_BUG_FIX
+ /*
+  * DEC_MOTIF_BUG_FIX
+  * Part 1 of 1
+  * Additional parts: None
+  * Reference:  CLD USG-00477 (MOTIF_BUGS 220) and OSF_QAR SS 46604
+  * Fixed by:   Sam Wang
+  * Date:       June 19, 1996
+  *
+  * Description:Fixed the corrupted pointer.
+  *
+  */
+     {
+       TextFGCData gc_data = GetTextFGCData((Widget) new_tf);
+
+       if ( gc_data->tf == old_tf)
+             gc_data->tf = NULL;
+     }
+ #endif/* DEC_MOTIF_BUG_FIX */
      return redisplay;
  }
  static Boolean

         ==================================================================          

falpha.zk3.dec.com <Xm> [56] % echo $NEW
GOLDMINX;HW3X_BL7;<>
falpha.zk3.dec.com <Xm> [57] % blog TextF.c | grep GOLDMINX

[ ./motif/lib/Xm/TextF.c ]
        GOLDMINX_BL7: 1.1.19.4
        GOLDMINX_BL5: 1.1.19.4
        GOLDMINX_BL4: 1.1.19.4
        GOLDMINX_PRE_BL4: 1.1.19.4
        GOLDMINX_PRE_BL3: 1.1.19.2
        GOLDMINX_BL3: 1.1.19.3
        GOLDMINX_BL2: 1.1.19.2
        GOLDMINX: 1.1.19
        GOLDMINX_PRE_BL2: 1.1.14.8
        GOLDMINX_KITBLD: 1.1.19.4
        GOLDMINX_BL1: 1.1.14.8
falpha.zk3.dec.com <Xm> [58] % blog TextF.c | grep -i v32supportx

[ ./motif/lib/Xm/TextF.c ]
        V32SUPPORTX: 1.1.30
        V32SUPPORTX_BL4: 1.1.19.4
        V32SUPPORTX_KITBLD: 1.1.19.4
        V32SUPPORTX_NIGHTLY: 1.1.30.2
falpha.zk3.dec.com <Xm> [59] % currentsb -all
v32 Jenny_Vu_usg477 /home/jennyd/sb . /home/jennyd/sb/v32/rc_files/local /tmp_mn
t/finr/share/inr/build/v32support.dsk6/v32supportx.nightly


Should the variable NEW be set to V32SUPPORTX instead of GOLDMINX because 
NEW doesn't reflect the last module version that was checked into 
v32supportx.nightly pool?
 
Thanks,

	Jenny