[ros-diffs] [greatlrd] 20246: adding binary convert tested betwin dec -> bin -> hex -> bin -> oct and works

[greatlrd at svn.reactos.com]

adding binary convert tested betwin dec -> bin -> hex -> bin -> oct and
works
Modified: trunk/reactos/subsys/system/calc/winecalc.c
  _____  

Modified: trunk/reactos/subsys/system/calc/winecalc.c
--- trunk/reactos/subsys/system/calc/winecalc.c	2005-12-18 16:03:35 UTC
(rev 20245)
+++ trunk/reactos/subsys/system/calc/winecalc.c	2005-12-18 17:05:35 UTC
(rev 20246)
@@ -2960,15 +2960,53 @@

         break;
 
     case NBASE_BINARY:
-        real = calc_atof(calc->buffer, old_base);
+        {
+          int buf=0;          
+          int t;
 
-        _stprintf(calc->display, TEXT("%lx"), (long)real);
-        old_base = NBASE_BINARY;
+          if (calc->buffer[0]==_T('\0'))
+          {
+            real=0;
+          }
+          else
+          {
+            real = calc_atof(calc->buffer, old_base);
+          }
+          
+          calc->display[buf]=_T('0');
+          calc->buffer[buf]=_T('0');
+          for (t=31;t>=0;t--)
+          {                  
+            if (((((long)real)>>t) & ~0xFFFFFFFE)==0)
+            {
+                calc->display[buf]=_T('0');
+                calc->buffer[buf]=_T('0');
+                buf++;
+            }
+            else
+            {
+                calc->display[buf]=_T('1');
+                calc->buffer[buf]=_T('1');
+                buf++;
+            }
+            
+          }
+        
+          if (buf==0) 
+          {
+              buf++;
+          }
+         
+          calc->buffer[buf]=_T('\0');
+          calc->display[buf]=_T('\0');          
+          old_base = NBASE_BINARY;
+        }
         break;
 
     case NBASE_DECIMAL:
-        calc_buffer_format(calc);
 
+       calc_buffer_format(calc);
+
         if (calc->displayMode) {
             if (!_tcscmp(calc->buffer, TEXT("0")) || !calc->buffer[0])
{
                 _tcscpy(calc->display, TEXT("0.e+0"));
@@ -2978,7 +3016,7 @@
                 int lz = 0;
                 int exp = 0;
 
-                real = calc_atof(calc->buffer, calc->numBase);
+                real = calc_atof(calc->buffer,old_base);
                 _stprintf(s, FMT_DESC_EXP, real);
                 // remove leading zeros in exponent
                 p = s;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051218/13a756b9/attachment.html