X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=57c93a75e9b9113d6c8da1dd6ae66dd1862dcfdf;hb=4a2cafb58caa55701e588d44fd0ebb674d6a81c6;hp=aeb0733d5e56d593f15a640033511f439fa99295;hpb=b9c0bd0865006169c32be33c4ebb3f6d98f4a428;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index aeb0733..57c93a7 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -278,6 +278,188 @@ void swf_SetFixed8(TAG * t, float f)
   swf_SetU8(t, (U8)f - (f<0 && fr!=0));
 }
 
+U32 swf_GetU30(TAG*tag)
+{
+    U32 shift = 0;
+    U32 s = 0;
+    int nr=0;
+    while(1) {
+	U8 b = swf_GetU8(tag);
+        nr++;
+	s|=(b&127)<<shift;
+	shift+=7;
+	if(!(b&128) || shift>=32)
+	    break;
+    }
+    /*int nr2= swf_SetU30(0, s);
+    if(nr!=nr2) {
+      printf("Unsigned value %d stored in %d bytes, I'd store it in %d bytes\n", s, nr, nr2);
+    }*/
+    return s;
+}
+
+int swf_SetU30(TAG*tag, U32 u)
+{
+    if(u&0x80000000) {
+      fprintf(stderr, "Error: Bit 31 set in U30 value\n");
+      u&=0x7fffffff;
+    }
+    int nr = 0;
+    do {
+        if(tag)
+	  swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F));
+	u>>=7;
+        nr++;
+    } while(u);
+    return nr;
+}
+
+void swf_SetABCU32(TAG*tag, U32 u)
+{
+  do {
+      swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F));
+      u>>=7;
+  } while(u);
+}
+U32 swf_GetABCU32(TAG*tag)
+{
+  return swf_GetU30(tag);
+}
+void swf_SetABCS32(TAG*tag, S32 v)
+{
+  swf_SetABCU32(tag, v);
+}
+S32 swf_GetABCS32(TAG*tag)
+{
+  return swf_GetABCU32(tag);
+}
+
+#if 0
+
+/*The AVM2 spec is just plain wrong, claiming that S32 values are sign
+extended. They're not.
+This wastes up to 4 bytes for every negative value. */
+
+void swf_SetABCS32(TAG*tag, S32 s)
+{
+  printf("write S32: %d\n", s);
+    S32 neg = s<0?-1:0;
+    U8 sign = s<0?0x40:0;
+    while(1) {
+        U8 val = s&0x7f;
+        U8 vsign = s&0x40;
+	s>>=7;
+        neg>>=7;
+        if(s==neg && vsign==sign) {
+            /* if the value we now write has the same sign as s
+               and all the remaining bits are equal to the sign of s
+               too, stop writing */
+	    swf_SetU8(tag, val);
+            printf("put %02x\n", val);
+            break;
+        } else {
+            swf_SetU8(tag, 0x80 | val);
+            printf("put %02x\n", 0x80|val);
+        }
+    };
+}
+int swf_GetS30(TAG*tag)
+{
+    U32 shift = 0;
+    U32 s = 0;
+    int nr=0;
+    while(1) {
+	U8 b = swf_GetU8(tag);
+        nr++;
+	s|=(b&127)<<shift;
+	shift+=7;
+	if(!(b&128) || shift>=32) {
+            if(b&64) {
+                if(shift<32) 
+                  s|=0xffffffff<<shift;
+            }
+	    break;
+        }
+    }
+    /* It's not uncommon for other applications (Flex for all negative numbers, and
+       Flash for -1) to generate a lot more bytes than would be necessary.
+       int nr2= swf_SetS30(0, s);
+    if(nr!=nr2) {
+      printf("Signed value %d stored in %d bytes, I'd store it in %d bytes\n", s, nr, nr2);
+    }*/
+    return s;
+}
+#endif
+
+int swf_SetU30String(TAG*tag, const char*str)
+{
+    int l = strlen(str);
+    int len=0;
+    len+=swf_SetU30(tag, l);
+    len+=l;
+    swf_SetBlock(tag, (void*)str, l);
+    return len;
+}
+double swf_GetD64(TAG*tag)
+{
+    /* FIXME: this is not big-endian compatible */
+    double value = *(double*)&tag->data[tag->pos];
+    swf_GetU32(tag);
+    swf_GetU32(tag);
+    return value;
+}
+int swf_SetD64(TAG*tag, double v)
+{
+    /* FIXME: this is not big-endian compatible */
+    swf_SetU32(tag, ((U32*)&v)[0]);
+    swf_SetU32(tag, ((U32*)&v)[1]);
+    return 8;
+}
+int swf_GetU24(TAG*tag)
+{
+    int b1 = swf_GetU8(tag);
+    int b2 = swf_GetU8(tag);
+    int b3 = swf_GetU8(tag);
+    return b3<<16|b2<<8|b1;
+}
+int swf_GetS24(TAG*tag)
+{
+    int b1 = swf_GetU8(tag);
+    int b2 = swf_GetU8(tag);
+    int b3 = swf_GetU8(tag);
+    if(b3&0x80) {
+        return -1-((b3<<16|b2<<8|b1)^0xffffff);
+    } else {
+        return b3<<16|b2<<8|b1;
+    }
+}
+int swf_SetU24(TAG*tag, U32 v)
+{
+    if(tag) {
+        if(v&0xff000000)
+          fprintf(stderr, "Error: Overflow in swf_SetU24()\n");
+        swf_SetU8(tag, v);
+        swf_SetU8(tag, v>>8);
+        swf_SetU8(tag, v>>16);
+    }
+    return 3;
+}
+int swf_SetS24(TAG*tag, U32 v)
+{
+    if(tag) {
+        if(!(v&0xff000000))
+          return swf_SetU24(tag, v);
+        if((v&0xff000000)!=0xff000000) {
+          fprintf(stderr, "Error: Overflow in swf_SetS24()\n");
+        }
+        swf_SetU8(tag, v);
+        swf_SetU8(tag, v>>8);
+        swf_SetU8(tag, v>>16);
+    }
+    return 3;
+}
+
+
 int swf_SetRGB(TAG * t,RGBA * col)
 { if (!t) return -1;
   if (col)
@@ -762,6 +944,15 @@ void  swf_SetPassword(TAG * t, const char * password)
 
     swf_SetU16(t,0);
     swf_SetString(t, (U8*)md5string);
+} 
+
+void swf_SetString(TAG*t, const char* s) 
+{
+    if(!s) {
+        swf_SetU8(t, 0);
+    } else {
+        swf_SetBlock(t,s,strlen(s)+1);
+    }
 }
 
 int swf_VerifyPassword(TAG * t, const char * password)