[Cpri-develop] cpri/src drv_stdwin.c,1.17,1.18
Brought to you by:
chrisan,
rasmusmyklebust
|
From: <ras...@us...> - 2003-12-09 21:42:08
|
Update of /cvsroot/cpri/cpri/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26158
Modified Files:
drv_stdwin.c
Log Message:
Fixed bugitems #827139, #839155
Index: drv_stdwin.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/drv_stdwin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** drv_stdwin.c 24 Nov 2003 01:45:45 -0000 1.17
--- drv_stdwin.c 9 Dec 2003 21:42:02 -0000 1.18
***************
*** 142,146 ****
DEVMODE *dvmd;
!
int posStack[POSSTACKSIZE*2];
int *posStackPos;
--- 142,146 ----
DEVMODE *dvmd;
! HANDLE hdvmd;
int posStack[POSSTACKSIZE*2];
int *posStackPos;
***************
*** 733,737 ****
dd->ghdc=pd.hDC;
! dd->dvmd=pd.hDevMode;
// free(pd.hDevNames);
/*
--- 733,738 ----
dd->ghdc=pd.hDC;
! dd->hdvmd=pd.hDevMode;
! dd->dvmd=NULL;
// free(pd.hDevNames);
/*
***************
*** 824,828 ****
dd->NextToken=dd->outText;
*dd->outText='\0';
!
while(dd->pos<dd->bufsize)
{
--- 825,829 ----
dd->NextToken=dd->outText;
*dd->outText='\0';
!
while(dd->pos<dd->bufsize)
{
***************
*** 1214,1222 ****
{
int bytesRead=0;
! t_printerq *q;
! q = dd->q;
! _CpriInitBufferedInput(q);
! dd->prnbuf = _CpriGetInputPos(q);
dd->di.lpszDocName= _CpriProcessedName(q);
--- 1215,1225 ----
{
int bytesRead=0;
! t_printerq *q;
! q = dd->q;
! dd->dvmd=GlobalLock(dd->hdvmd);
!
! _CpriInitBufferedInput(q);
! dd->prnbuf = _CpriGetInputPos(q);
dd->di.lpszDocName= _CpriProcessedName(q);
***************
*** 1239,1245 ****
q->drv->bufsize=_CpriGetInputSize(q)-2; /* skip the 2 last control chars */
! /* q->drv->dvmd.dmSize=sizeof(DEVMODE);
! q->drv->dvmd.dmDriverExtra=0;
! q->drv->dvmd.dmFields=0;*/
dd->OrgFnt=NULL;
--- 1242,1246 ----
q->drv->bufsize=_CpriGetInputSize(q)-2; /* skip the 2 last control chars */
! q->drv->dvmd->dmFields=0;
dd->OrgFnt=NULL;
***************
*** 1262,1265 ****
--- 1263,1268 ----
_CpriPopFront(q);
+ GlobalUnlock(dd->hdvmd);
+ dd->dvmd=NULL;
// Release((void*)dd->di.lpszDocName);
return EOF;
|