[Cpri-develop] cpri/src drv_stdwin.c,1.18,1.19

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cpri/cpri/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19666

Modified Files:
	drv_stdwin.c 
Log Message:
Fixed bug #2955653

Index: drv_stdwin.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/drv_stdwin.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** drv_stdwin.c	9 Dec 2003 21:42:02 -0000	1.18
--- drv_stdwin.c	20 Feb 2010 17:16:32 -0000	1.19
***************
*** 1,5 ****
  #if DEGUBMODE==1 || defined _DEBUG
  #define USE_LINES 0
! #define USE_STD_PRINTER 0
  #define DEBUG_PRINTS 1
  #else 
--- 1,5 ----
  #if DEGUBMODE==1 || defined _DEBUG
  #define USE_LINES 0
! #define USE_STD_PRINTER 1
  #define DEBUG_PRINTS 1
  #else 
***************
*** 107,111 ****
  	int tablemode;				 /* Indicates if table mode is used */
  	int linebreaking;			 /* Indicates that a rowbreaking is in progress */
! 
  	t_macro head;				// The head macro...
  	int nocopies;                /* number of copies of each printout */
--- 107,111 ----
  	int tablemode;				 /* Indicates if table mode is used */
  	int linebreaking;			 /* Indicates that a rowbreaking is in progress */
!    int endseqrec;          /* Indicates that the end start seq is received */
  	t_macro head;				// The head macro...
  	int nocopies;                /* number of copies of each printout */
***************
*** 728,733 ****
  	
  	pd.lStructSize=sizeof(PRINTDLG);
! 	pd.Flags=PD_RETURNDC|PD_RETURNDEFAULT;
! 	
  	PrintDlg(&pd);
  
--- 728,736 ----
  	
  	pd.lStructSize=sizeof(PRINTDLG);
! #if USE_STD_PRINTER==1
!    pd.Flags=PD_RETURNDC|PD_RETURNDEFAULT;
! #else
!    pd.Flags=PD_RETURNDC;
! #endif   
  	PrintDlg(&pd);
  
***************
*** 899,903 ****
  				//x
  				param=GetParam(q);
! 				_CpriInitTabs(&dd->ActiveFormat.tf,0,dd->xscaling);
  				if(param*dd->xscaling<dd->xoffset)
  					param=dd->xoffset/dd->xscaling+1;
--- 902,906 ----
  				//x
  				param=GetParam(q);
! 				_CpriInitTabs(&dd->ActiveFormat.tf,dd->ActiveFormat.margin.mm,dd->xscaling);
  				if(param*dd->xscaling<dd->xoffset)
  					param=dd->xoffset/dd->xscaling+1;
***************
*** 1149,1166 ****
  				break;
  			case EPC_END_START_SEQUENCE:
! 				if(!ResetDC(dd->ghdc,dd->dvmd))
! 				{
! 					DWORD error;
! 					error=GetLastError();
  #ifdef DEBUG
! 					assert(0);
  #endif
! 				}
! 				
! 				StartPage(dd->ghdc);
! 				SetTextAlign(dd->ghdc,VERT_TEXT_ALIGN|TA_LEFT|TA_UPDATECP);
! 				GetRes(dd);
! 				if(dd->barw==0)
! 					dd->barw=(int)(NBARWIDTH*dd->xscaling+0.5);
  				break;
  			case EPC_CASSETTE_FEED:
--- 1152,1174 ----
  				break;
  			case EPC_END_START_SEQUENCE:
! 				if(!dd->endseqrec)
!             {
!                if(!ResetDC(dd->ghdc,dd->dvmd))
! 				   {
! 					   DWORD error;
! 					   error=GetLastError();
  #ifdef DEBUG
! 					   assert(0);
  #endif
! 				   }
! 				   
! 				   StartPage(dd->ghdc);
! 				   SetTextAlign(dd->ghdc,VERT_TEXT_ALIGN|TA_LEFT|TA_UPDATECP);
! 				   GetRes(dd);
! 				   if(dd->barw==0)
! 					   dd->barw=(int)(NBARWIDTH*dd->xscaling+0.5);
!                dd->endseqrec=1;
!             }
! 			   SetTextAlign(dd->ghdc,VERT_TEXT_ALIGN|TA_LEFT|TA_UPDATECP);
  				break;
  			case EPC_CASSETTE_FEED:
***************
*** 1192,1196 ****
  				deleteMacros(&dd->macros);
  				break;
! 				
  				
  			default:
--- 1200,1204 ----
  				deleteMacros(&dd->macros);
  				break;
! 			
  				
  			default:
***************
*** 1240,1243 ****
--- 1248,1252 ----
  		dd->barh=BARCODEHEIGHT;
  		dd->barw=0;
+       dd->endseqrec=0;
  
  		q->drv->bufsize=_CpriGetInputSize(q)-2; /* skip the 2 last control chars */