[PATCH 2/5] wineps.drv: Write page orientation hint for every page.

[Piotr Caban]

From: Piotr Caban

---
 dlls/wineps.drv/ps.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 149bfc81c36..744bda62497 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -56,7 +56,6 @@ static const char psheader[] = /* title llx lly urx ury orientation */
 "%%%%Title: %s\n"
 "%%%%BoundingBox: %d %d %d %d\n"
 "%%%%Pages: (atend)\n"
-"%%%%Orientation: %s\n"
 "%%%%EndComments\n";

static const char psbeginprolog[] =
@@ -96,6 +95,7 @@ static const char psendfeature[] =

static const char psnewpage[] = /* name, number, xres, yres, xtrans, ytrans, rot */
 "%%%%Page: %s %d\n"
+"%%%%PageOrientation: %s\n"
 "%%%%BeginPageSetup\n"
 "/pgsave save def\n"
 "72 %d div 72 %d div scale\n"
@@ -402,7 +402,6 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title )
     DUPLEX *duplex = find_duplex( ctx->pi->ppd, &ctx->Devmode->dmPublic );
     int llx, lly, urx, ury;
     int ret, len;
-    const char * dmOrientation;

struct ticket_info ticket_info = { page, duplex };

@@ -459,8 +458,7 @@ INT PSDRV_WriteHeader( print_ctx *ctx, LPCWSTR title )
     }
     /* FIXME should do something better with BBox */

-    dmOrientation = (ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait");
-    sprintf(buf, psheader, escaped_title, llx, lly, urx, ury, dmOrientation);
+    sprintf(buf, psheader, escaped_title, llx, lly, urx, ury);

HeapFree(GetProcessHeap(), 0, escaped_title);

@@ -551,8 +549,9 @@ INT PSDRV_WriteNewPage( print_ctx *ctx )
     }

sprintf(buf, psnewpage, name, ctx->job.PageNo,
-	    GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY),
-	    xtrans, ytrans, rotation);
+            ctx->Devmode->dmPublic.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait",
+            GetDeviceCaps(ctx->hdc, ASPECTX), GetDeviceCaps(ctx->hdc, ASPECTY),
+            xtrans, ytrans, rotation);

if( write_spool( ctx, buf, strlen(buf) ) != strlen(buf) ) {
         WARN("WriteSpool error\n");