From e6231f2d2e55f7ab8c0797c39eaa64756e61c86a Mon Sep 17 00:00:00 2001
From: Honfika <honfika@gmail.com>
Date: Tue, 24 Dec 2013 15:08:55 +0100
Subject: [PATCH] Issue #428 flash player window resized to the size of the
 loaded SWF, scalemode is configurable

---
 trunk/libsrc/Swf2Exe/uMain.pas                |  32 ++++++++++++------
 .../flash/configuration/Configuration.java    |   2 ++
 .../com/jpexs/decompiler/flash/gui/Main.java  |  11 ++++++
 .../com/jpexs/helpers/resource/Swf2Exe.bin    | Bin 469504 -> 470016 bytes
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/trunk/libsrc/Swf2Exe/uMain.pas b/trunk/libsrc/Swf2Exe/uMain.pas
index 03fd73560..fa5a3537a 100644
--- a/trunk/libsrc/Swf2Exe/uMain.pas
+++ b/trunk/libsrc/Swf2Exe/uMain.pas
@@ -37,13 +37,16 @@ end;
 
 procedure TfrmMain.FormCreate(Sender: TObject);
 const
-  exeSize = 469504;
+  exeSize = 470016;
 var
   stream: TFileStream;
   buffer: array of Byte;
   tempFile: array[0..MAX_PATH - 1] of Char;
   tempPath: array[0..MAX_PATH - 1] of Char;
   flashVarData : TVarData;
+  width: Integer;
+  height: Integer;
+  scaleMode: Byte;
 begin
   flaPreview := TMySWF.Create(frmMain);
   flaPreview.Parent := frmMain;
@@ -54,16 +57,25 @@ begin
     raise Exception.Create(
       'GetTempFileName API failed. ' + SysErrorMessage(GetLastError)
     );
-  stream := TFileStream.Create(ParamStr(0), fmOpenRead);
-  stream.Seek(exeSize, soBeginning);
-  SetLength(buffer, stream.Size - exeSize);
   try
-    stream.Read(buffer[0], Length(buffer));
-  finally
-    stream.Free;
+    stream := TFileStream.Create(ParamStr(0), fmOpenRead);
+    stream.Seek(exeSize, soBeginning);
+    stream.Read(width, 4);
+    stream.Read(height, 4);
+    stream.Read(scaleMode, 1);
+    SetLength(buffer, stream.Size - exeSize);
+    try
+      stream.Read(buffer[0], Length(buffer));
+    finally
+      stream.Free;
+    end;
+  except
+    width := 12800;
+    height := 9600;
+    scaleMode := 3;
   end;
-  stream := TFileStream.Create(ParamStr(0), fmOpenRead);
-  stream.Seek(exeSize, soBeginning);
+  ClientWidth := width div 20;
+  ClientHeight := height div 20;
   stream := TFileStream.Create(tempFile, fmOpenWrite);
   try
     stream.Write(buffer[0], Length(buffer));
@@ -71,7 +83,7 @@ begin
     stream.Free;
   end;
   flaPreview.Movie := tempFile;
-  flaPreview.ScaleMode := 3;
+  flaPreview.ScaleMode := scaleMode;
 end;
 
 procedure TfrmMain.FormResize(Sender: TObject);
diff --git a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index 321aa001d..9a6e3b7e3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/trunk/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -173,6 +173,8 @@ public class Configuration {
     public static final ConfigurationItem<Integer> guiSplitPane1DividerLocation = null;
     @ConfigurationName("gui.splitPane2.dividerLocation")
     public static final ConfigurationItem<Integer> guiSplitPane2DividerLocation = null;
+    @ConfigurationDefaultInt(3)
+    public static final ConfigurationItem<Integer> saveAsExeScaleMode = null;
     
     private enum OSId {
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index 346e0b1c1..581d1eca5 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -263,6 +263,17 @@ public class Main {
             while((bytesRead = exeStream.read(buffer)) != -1) {
                 fos.write(buffer, 0, bytesRead);
             }
+            int width = swf.displayRect.Xmax - swf.displayRect.Xmin;
+            int height = swf.displayRect.Ymax - swf.displayRect.Ymin;
+            fos.write(width & 0xff);
+            fos.write((width >> 8) & 0xff);
+            fos.write((width >> 16) & 0xff);
+            fos.write((width >> 24) & 0xff);
+            fos.write(height & 0xff);
+            fos.write((height >> 8) & 0xff);
+            fos.write((height >> 16) & 0xff);
+            fos.write((height >> 24) & 0xff);
+            fos.write(Configuration.saveAsExeScaleMode.get());
         }
         swf.saveTo(fos);
         if (tmpFile.exists()) {
diff --git a/trunk/src/com/jpexs/helpers/resource/Swf2Exe.bin b/trunk/src/com/jpexs/helpers/resource/Swf2Exe.bin
index 7162b05d51b691ab4237738a2e9cd9982613b698..54688ce226339378cd19e87633c69d653c0d54ef 100644
GIT binary patch
delta 2164
zcmZvce@Glh6vyYz+x23sH72H#Sh0Upks9%G!5?w&N3AO%=+$COo0eD$B4R;Fn^K`t
zuUt)YE-RArJdKU<s4Ynep|zBY7tkvgVk~VUK@uC1BK?uBDB%j%)Sl7ldwV}N$}a4i
znfG~b<~wg@*FK+ZU&#LEc}?m7L&$)J;4|PV(A-VYp8-$0JWSEPR4@diryeUIfy(-N
z*;Aeh&0LIMay4r6HJ4ncz|OfY%k~b~+pZ05zP5~Yy_%G>Z7exDRiVR{^qDP51Fsfd
z?CX5CBxbr-t2^&|wvU<8?Eh(<()y#X8)uy&cAes!Z0BWrU$zTqYr{_di80X78XW9r
zp6m8cQTj#keVz!Jg<!pMS5IGS?aiDYjg6&(_t)tJBQxp2$#p9B{0>vqwd$Y{l71!v
zj=wg*(MDPqASs5Whu0&tC-8wuazjUS<MPtMj5R8V*cE#~RX6qj0U1))R}pZd%n6P6
z(-T%A<?UIclKWhQqSmwLc+yOZo1M9BM0Dexi~(s##2g$zPUy(XL^}L<jXL>NkU<KQ
ziSf3;uL`i2EU_Upse@ADIE&V&iVZ8Vad+IYJc)-I55P8^X6(ah9QR0_$cLjm^TG(I
z-T8flI<DzZnKPkG;KP#nJCJlkXb8tAG6vo}cC6W%-r5gw;FQYT5gJ@N^?8IYhX8iV
zbUAzJhv5jF;X`CUAv64n{Y65q^UFz61{6TxLzBBe-0;8u33CGfM0!V0!MU>8*#*uv
zjo5?7F1qnJCgtNfJ&sjEZ@fx*|HxHB_0`=_{AgiO{wEWg<)<g)*Fqf1|7ZZ^&yJvc
zu?H{O(`)^55!XVmzXb$GFHFrmoYrh_?Xtf!;Tyk&CkUmf#M=BQ-x*AkYA)bqLbZN8
zFv;$PF&`G9b^jX58(gZv)o;Ds_?GbJ@gO0d56>`%8q3eeH$s^MaFG+rtpI{ccg{l2
z>hYiuaO^{@2{s5TSb=vFd5Mho<c#rH#w#GB%U9rHwreY@fb4=7pBiXk4#&07m6Onw
zLQ@gyoew~nh_uj7<9&bF3-E56r^C(c&X`evRM7$ZE%A8V%n48W&&=OwrhWQBW@u1T
z<?|M@SGA^%iWF`Kx0ic?%i|1O30KLra31a=ca?j<Rhf>Mx=b4L4s*G=!|X7-&68%v
zve%MtIbf-_)LU9S!$$UyZj2#|o@a_#uP5y>lehD<q2DlK_|ovL;ff(>xM7$x-1AKr
zvpl1%>-4ZCtPR_vC2Tdeqa|#M>@Q`D_SAI_VJ!%LC;IKg-l-#Y97CL~lpVylhox*D
zwrOQ-^``hYAU-QO5#L_M?oRONjD%QYKRaAkjW;R$rW&^^d_#@Lf2J^hQMt<c0VTgt
zjV~&^PmL2jRzt4Glp4=f_#-uLRd~+9E&3Sv7@8DrQ{#4pf4r5Wt}%sQR^tJM|Ek6p
z6`oeHMIX*jw#gRngISH|D!g5dTNOU4#+wv=Q;pjdzM;m)6kf!s=np8oQH?Juyibjj
Yl*In0)OfDKAE|L`g8Onz>~Aao1H6pk!T<mO

delta 2117
zcmZvcYfKzf6vyxE?hJHGS|s6-iUb=ieL=ciA5dn7)w=jWT`?53ni5Fpx<W;<B_XNl
zZh}-{G8kEwCDtMv(NI1#1~m(4V3KWo#DtPc6b&(GiVl$wK2Wk*9@lebA0uQYnRD+w
zzjM#|&$)NkH<$05&Hv&7CZmTXq?aN1Jmo*a{AwNh5ImW%?D1Po$By*D>VJ=e5ar40
zYRw~Lz%Y~GBmP=b5i{by3U=CmQ?tK-o$+s*icF7j{^!jFdj`|usgAb0%<s9(47?_I
zac&8_%<NQ`X?P&Kznh(8>~mX`R@;B<lyTB2&uex;vv)PStXUQ9b5Xle<7o=g57=Dq
z_#~yDo|tzMDf>9skTy-HFL=7L+XfPA_3*_lI?8HHoxik2<&ITIROPWiE7Y{_W8hfZ
z21g_DyaSsOSY7-sMmv;NLG6W!9KhmgS=I)XWSq(!pvg-o-iICP<<Dc_Mv<dT=-n0v
zQ6E0ALDk;tG1^Gv0DgmAQ9qM03KtNydgckDzO=qUJDr<Qm>f+b_B)buQv&sQIA+qU
zV)VBEPO4;QbR5r3${xN3<*L4p(e_&wyW*|!JbT?q8t93J&O*r<RWE-DC4P`<qL?9%
zR%h6iSI(Yo=*;v~LmW8O)<BF#mLea==)bF|4Z955teQ4lB(;5e&sbX{BX{5d$$_<P
zFQwyJ7Z--`)6kvVekHyg&uV3d#NS4DO3X}2yqA#pb1zDKP?IQk;FZ8y$x^lvEQQ_)
zw-<U6Ki8pI;AU7(w55ETxAD^w-~YCDvbaqh8pb0>u@iWq)wvL?ozX;dO<!U4p=;2f
z+pkKC=OSc31i9S}gu;^#^QX^WI&=Pww<=%15M1eDi@i&bI(`I{ErnayY8`t71~nV%
zr0TCiP-N*4rj4G9NJ@J#hBA>FX&HNT|0l^DsT~Kw6<J#QD8Az~6h01~^m+%Gt8<Xe
zS_c`1*H<6z_Ot6u`5F`$gBPDo7$I@{t<|xIV2|pUiqX)l0yluDhu@^h`NU8NU{O<W
zD!}Gs<?29{V6I*b{u5wZ!s-2Ne;;!p94g_yF;&p=y?hp*&mZKA_>=tO{AvC*zMmiA
zXZSQBSEvx0gd4)R@TZU~9uozzUc4bri9d;V#Jl3UXs*Z!wmix;TLxJ&7F@J(q5B-R
zXKXdLdYi{~(bi`3*}B40Cpjl;3c7<_Dd)oR#Zs;k$AMDLt@+Eik^@0^KX!!RuOfXf
z@wHiq57!XqD&zVv?(Z`05RUs!ag{sbUxxU+v{ZcaDK00);~5EYB>ugyt`V=(`Lq%D
z>3rLWC;uHGe@VGPeMR42Ys43H-fhH5I(9?r$D|Q2)cJ}Lcj&x;-=&YW5K^aeml5~r
z{K{^Qx(0QA(}*iN|HFtc=zO2BOCRPZdo+vpK{VopI&U`O4xJAe@j9JP8*!h`w~hFq
n&PzlC{ff?OjrfAjyNx)proMmDh!^U7#fUpnJX}!0{k8lbZNcB$