Changeset 2324 for trunk/gsinstaller


Ignore:
Timestamp:
2001-04-19T10:31:06+12:00 (23 years ago)
Author:
sjboddie
Message:

Replaced some bool, true and false with BOOL, TRUE and FALSE because
VC++ is stupid.

Location:
trunk/gsinstaller
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsinstaller/DiskSpace.cpp

    r1397 r2324  
    2121    if (!GetDiskFreeSpace(rootName, &sectorsPerCluster, &bytesPerSector,
    2222                                                &freeClusters, &totalClusters))
    23     { this->initialised = false;
     23    { this->initialised = FALSE;
    2424    return;
    2525    }
    … …  
    3737        proc        = GetProcAddress(module, "GetDiskFreeSpaceEx");
    3838        if (proc == NULL)
    39         {   this->initialised = true;
     39        {   this->initialised = TRUE;
    4040            return;
    4141        }
    … …  
    4646        //freeClusters = totalBytes;
    4747    }
    48   this->initialised = true;
     48  this->initialised = TRUE;
    4949    return;
    5050}
    5151
    52 bool DiskSpace::initialisedOk()
     52BOOL DiskSpace::initialisedOk()
    5353{   return this->initialised;
    5454}

  • trunk/gsinstaller/DiskSpace.h

    r1397 r2324  
    88  DWORD bytesPerSector;
    99  DWORD freeClusters;
    10   bool  initialised;
     10  BOOL  initialised;
    1111protected:
    1212public:
    … …  
    1414  int                   fileSpace(int fileSize);
    1515  int                   fileClusters(int fileSize);
    16   bool                  initialisedOk();
     16  BOOL                  initialisedOk();
    1717  unsigned long totalFreeSpace();
    1818};

  • trunk/gsinstaller/registry.cpp

    r1541 r2324  
    22#include <stdlib.h>
    33
    4 bool registry_createkey(HKEY key, const char *name, PHKEY keyout)
     4BOOL registry_createkey(HKEY key, const char *name, PHKEY keyout)
    55{
    66  LONG reply;
    … …  
    1818}
    1919
    20 bool registry_openkey(HKEY key, const char *name, PHKEY keyout)
     20BOOL registry_openkey(HKEY key, const char *name, PHKEY keyout)
    2121{
    2222  LONG reply;
    … …  
    2525  if (reply != ERROR_SUCCESS)
    2626    {
    27       return false;
    28     }
    29   return true;
    30 }
    31 
    32 bool registry_deletekey(HKEY key, const char *name)
     27      return FALSE;
     28    }
     29  return TRUE;
     30}
     31
     32BOOL registry_deletekey(HKEY key, const char *name)
    3333{   
    3434  if (RegDeleteKey(key, name) != ERROR_SUCCESS)
    3535    {
    36       return false;
    37     }
    38   return true;
    39 }
    40 
    41 bool registry_closekey(HKEY key)
     36      return FALSE;
     37    }
     38  return TRUE;
     39}
     40
     41BOOL registry_closekey(HKEY key)
    4242{
    4343  LONG reply;
    … …  
    5050}
    5151
    52 bool registry_keyExists(HKEY key, const char *name)
     52BOOL registry_keyExists(HKEY key, const char *name)
    5353{
    5454  HKEY local;
    … …  
    5656  if (!registry_openkey(key, name, &local))
    5757  {
    58     return false;
     58    return FALSE;
    5959  }
    6060  registry_closekey(local);
    61   return true;
    62 }
    63 
    64 bool registry_ensureKeyExists(HKEY key, const char *name)
     61  return TRUE;
     62}
     63
     64BOOL registry_ensureKeyExists(HKEY key, const char *name)
    6565{
    6666  HKEY local;
    … …  
    7070      if (!registry_createkey(key, name, &local))
    7171    {
    72       return false;
     72      return FALSE;
    7373    }
    7474    }
    7575  registry_closekey(local);
    76   return true;
    77 }
    78 
    79 bool registry_deleteitem(HKEY key, const char *name)
     76  return TRUE;
     77}
     78
     79BOOL registry_deleteitem(HKEY key, const char *name)
    8080{
    8181  if (RegDeleteValue(key, name) != ERROR_SUCCESS)
    8282    {
    83       return false;
    84     }
    85   return true;
    86 }
    87 
    88 bool registry_setstring(HKEY key, const char *name, const char *value)
     83      return FALSE;
     84    }
     85  return TRUE;
     86}
     87
     88BOOL registry_setstring(HKEY key, const char *name, const char *value)
    8989{
    9090  LONG reply;
    … …  
    9393  if (reply != ERROR_SUCCESS)
    9494  {
    95     return false;
    96   }
    97   return true;
    98 }
    99 
    100 bool registry_setlong(HKEY key, char *name, LONG value)
     95    return FALSE;
     96  }
     97  return TRUE;
     98}
     99
     100BOOL registry_setlong(HKEY key, char *name, LONG value)
    101101{
    102102  LONG  reply;
    … …  
    112112}
    113113
    114 bool registry_setblock(HKEY key, char *name, char *data, int size)
     114BOOL registry_setblock(HKEY key, char *name, char *data, int size)
    115115{
    116116  LONG  reply;
    … …  
    125125}
    126126
    127 bool registry_setint(HKEY key, char *name, int value)
     127BOOL registry_setint(HKEY key, char *name, int value)
    128128{
    129129  return registry_setlong(key, name, (LONG) value);
    130130}
    131131
    132 bool registry_getstring(HKEY key, char *name, char **string)
     132BOOL registry_getstring(HKEY key, char *name, char **string)
    133133{
    134134  LONG reply;
    … …  
    164164}
    165165
    166 bool registry_getint(HKEY key, char *name, int *out)
     166BOOL registry_getint(HKEY key, char *name, int *out)
    167167{
    168168  DWORD type;
    … …  
    178178}
    179179
    180 bool registry_getlong(HKEY key, char *name, LONG *out)
     180BOOL registry_getlong(HKEY key, char *name, LONG *out)
    181181{
    182182  DWORD type;
    … …  
    212212}
    213213
    214 bool registry_fetchlong(char *keystr, LONG *lptr)
     214BOOL registry_fetchlong(char *keystr, LONG *lptr)
    215215{
    216216  HKEY key;
    … …  
    231231}
    232232
    233 bool registry_fetchblock(char *keystr, char *data, int size)
     233BOOL registry_fetchblock(char *keystr, char *data, int size)
    234234{
    235235  HKEY key;
    … …  
    252252}
    253253
    254 bool registry_storelong(char *keystr, LONG value)
     254BOOL registry_storelong(char *keystr, LONG value)
    255255{
    256256  HKEY key;
    … …  
    271271}
    272272
    273 bool registry_storeint(char *keystr, int value)
     273BOOL registry_storeint(char *keystr, int value)
    274274{
    275275  HKEY key;
    … …  
    290290}
    291291
    292 bool registry_storeblock(char *keystr, char *data, int size)
     292BOOL registry_storeblock(char *keystr, char *data, int size)
    293293{
    294294  HKEY key;
    … …  
    309309}
    310310
    311 bool registry_storestring(char *keystr, char *value)
     311BOOL registry_storestring(char *keystr, char *value)
    312312{
    313313  HKEY key;

  • trunk/gsinstaller/registry.h

    r1475 r2324  
    33#include <windows.h>
    44
    5 bool registry_openkey(HKEY key, const char *name, PHKEY keyout);
    6 bool registry_storeblock(char *name, char *data, int size);
    7 bool registry_fetchblock(char *name, char *data, int size);
    8 bool registry_getstring(HKEY key, char *name, char **string);
    9 bool registry_setstring(HKEY key, const char *name, const char *string);
    10 bool registry_deleteitem(HKEY key, const char *name);
    11 bool registry_createkey(HKEY key, const char *name, PHKEY keyout);
    12 bool registry_deletekey(HKEY key, const char *name);
    13 bool registry_closekey(HKEY key);
    14 bool registry_keyExists(HKEY key, const char *name);
    15 bool registry_ensureKeyExists(HKEY key, const char *name);
     5BOOL registry_openkey(HKEY key, const char *name, PHKEY keyout);
     6BOOL registry_storeblock(char *name, char *data, int size);
     7BOOL registry_fetchblock(char *name, char *data, int size);
     8BOOL registry_getstring(HKEY key, char *name, char **string);
     9BOOL registry_setstring(HKEY key, const char *name, const char *string);
     10BOOL registry_deleteitem(HKEY key, const char *name);
     11BOOL registry_createkey(HKEY key, const char *name, PHKEY keyout);
     12BOOL registry_deletekey(HKEY key, const char *name);
     13BOOL registry_closekey(HKEY key);
     14BOOL registry_keyExists(HKEY key, const char *name);
     15BOOL registry_ensureKeyExists(HKEY key, const char *name);
    1616#endif
    1717
Note: See TracChangeset for help on using the changeset viewer.