i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix for HP PCL3 printer add-on.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1197 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2002-09-26 23:26:46 +00:00
parent 7a384fde36
commit f0ac1e5a7e
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/print/Printer.cpp
+10 -14
View File
@@ -358,7 +358,7 @@ void Printer::CloseJob() {
fJob->Release(); fJob->Release();
} }
status_t Printer::PrintSpooledJob(BFile* spoolFile, const BMessage& settings) status_t Printer::PrintSpooledJob(BFile* spoolFile)
{ {
take_job_func_t func; take_job_func_t func;
image_id id; image_id id;
@@ -367,8 +367,13 @@ status_t Printer::PrintSpooledJob(BFile* spoolFile, const BMessage& settings)
if ((rc=LoadPrinterAddon(id)) == B_OK) { if ((rc=LoadPrinterAddon(id)) == B_OK) {
// Addon was loaded, so try and get the take_job symbol // Addon was loaded, so try and get the take_job symbol
if ((rc=get_image_symbol(id, "take_job", B_SYMBOL_TYPE_TEXT, (void**)&func)) == B_OK) { if ((rc=get_image_symbol(id, "take_job", B_SYMBOL_TYPE_TEXT, (void**)&func)) == B_OK) {
// This seems to be required for legacy?
// HP PCL3 add-on crashes without it!
BMessage params('_RRC');
params.AddInt32("file", (int32)spoolFile);
params.AddInt32("printer", (int32)&fNode);
// call the function and check its result // call the function and check its result
BMessage* result = (*func)(spoolFile, &fNode, &settings); BMessage* result = (*func)(spoolFile, &fNode, &params);
if (result == NULL || result->what == 'baad') if (result == NULL || result->what == 'baad')
rc = B_ERROR; rc = B_ERROR;
} }
@@ -382,19 +387,10 @@ status_t Printer::PrintSpooledJob(BFile* spoolFile, const BMessage& settings)
void Printer::PrintThread(Job* job) { void Printer::PrintThread(Job* job) {
fResource->Lock(); fResource->Lock();
if (!fAbort) { if (!fAbort) {
BFile jobFile(&job->EntryRef(), B_READ_ONLY); BFile jobFile(&job->EntryRef(), B_READ_WRITE);
print_file_header header; print_file_header header;
BMessage settings; // Tell the printer to print the spooled job
if (PrintSpooledJob(&jobFile) == B_OK) {
// Read header from filestream
jobFile.Seek(0, SEEK_SET);
jobFile.Read(&header, sizeof(header));
// Get the printer settings
settings.Unflatten(&jobFile);
// and tell the printer to print the spooled job
if (PrintSpooledJob(&jobFile, settings) == B_OK) {
// Remove spool file if printing was successfull. // Remove spool file if printing was successfull.
job->Remove(); job->Remove();
} else { } else {
src/servers/print/Printer.h
+1 -1
View File
@@ -105,7 +105,7 @@ private:
bool FindSpooledJob(); bool FindSpooledJob();
void CloseJob(); void CloseJob();
status_t PrintSpooledJob(BFile* spoolFile, const BMessage& settings); status_t PrintSpooledJob(BFile* spoolFile);
void PrintThread(Job* job); void PrintThread(Job* job);
static status_t print_thread(void* data); static status_t print_thread(void* data);
status_t StartPrintThread(); status_t StartPrintThread();