reactos/tools/widl/widl_ros.diff

   1 --- hash.c      Fri Sep 29 17:48:44 2006
   2 +++ hash.c      Fri Jan 11 17:49:22 2008
   3 @@ -19,13 +19,11 @@
   4   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   5   */
   6  #include <stdio.h>
   7  #include <stdarg.h>
   8
   9 -#include "windef.h"
  10 -#include "winbase.h"
  11 -#include "winnls.h"
  12 +#include <host/nls.h>
  13
  14  #include "hash.h"
  15
  16  static const unsigned char Lookup_16[128 * 3] = {
  17   /* Common */
  18 @@ -533,17 +531,24 @@
  19    case LANG_ROMANIAN:   case LANG_SANSKRIT:   case LANG_SERBIAN:
  20    case LANG_SINDHI:     case LANG_SLOVENIAN:  case LANG_SWAHILI:
  21    case LANG_SWEDISH:    case LANG_SYRIAC:     case LANG_TAMIL:
  22    case LANG_TATAR:      case LANG_TELUGU:     case LANG_THAI:
  23    case LANG_UKRAINIAN:  case LANG_URDU:       case LANG_UZBEK:
  24 +#ifndef __REACTOS__
  25    case LANG_VIETNAMESE: case LANG_GAELIC:     case LANG_MALTESE:
  26    case LANG_TAJIK:      case LANG_ROMANSH:    case LANG_IRISH:
  27    case LANG_SAMI:       case LANG_UPPER_SORBIAN: case LANG_SUTU:
  28    case LANG_TSONGA:     case LANG_TSWANA:     case LANG_VENDA:
  29    case LANG_XHOSA:      case LANG_ZULU:       case LANG_ESPERANTO:
  30    case LANG_WALON:      case LANG_CORNISH:    case LANG_WELSH:
  31    case LANG_BRETON:
  32 +#else
  33 +  case LANG_VIETNAMESE: case LANG_MALTESE:    case LANG_IRISH:
  34 +  case LANG_SAMI:       case LANG_UPPER_SORBIAN:  case LANG_TSWANA:
  35 +  case LANG_XHOSA:      case LANG_ZULU:       case LANG_WELSH:
  36 +  case LANG_BRETON:
  37 +#endif
  38      nOffset = 16;
  39      pnLookup = Lookup_16;
  40      break;
  41    case LANG_CZECH:  case LANG_HUNGARIAN:  case LANG_POLISH:
  42    case LANG_SLOVAK: case LANG_SPANISH:
  43 --- server.c    Sat Jan 05 20:48:36 2008
  44 +++ server.c    Fri Jan 11 17:49:21 2008
  45 @@ -388,10 +388,11 @@
  46          error("Could not open %s for output\n", server_name);
  47
  48      print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name);
  49      print_server("#include <string.h>\n");
  50      fprintf(server, "\n");
  51 +    print_server("#define _SEH_NO_NATIVE_NLG\n");
  52      print_server("#include \"%s\"\n", header_name);
  53      fprintf(server, "\n");
  54  }
  55
  56
  57 --- typelib.c   Sat Jan 05 20:48:36 2008
  58 +++ typelib.c   Fri Jan 11 17:49:21 2008
  59 @@ -33,12 +33,11 @@
  60  #include <signal.h>
  61
  62  #define NONAMELESSUNION
  63  #define NONAMELESSSTRUCT
  64
  65 -#include "windef.h"
  66 -#include "winbase.h"
  67 +#include <host/typedefs.h>
  68
  69  #include "widl.h"
  70  #include "utils.h"
  71  #include "parser.h"
  72  #include "header.h"
  73 --- widl.c      Sat Jan 05 20:48:36 2008
  74 +++ widl.c      Fri Jan 11 17:49:21 2008
  75 @@ -547,10 +547,15 @@
  76        return 1;
  77      }
  78    }
  79
  80    if(do_header) {
  81 +    if (strrchr(header_name, '\\'))
  82 +        header_token = make_token(strrchr(header_name, '\\') + 1);
  83 +    else if (strrchr(header_name, '/'))
  84 +        header_token = make_token(strrchr(header_name, '/') + 1);
  85 +    else
  86      header_token = make_token(header_name);
  87
  88      if(!(header = fopen(header_name, "w"))) {
  89        fprintf(stderr, "Could not open %s for output\n", header_name);
  90        return 1;
  91 --- widltypes.h Sat Jan 05 20:48:36 2008
  92 +++ widltypes.h Fri Jan 11 17:49:22 2008
  93 @@ -19,10 +19,17 @@
  94   */
  95
  96  #ifndef __WIDL_WIDLTYPES_H
  97  #define __WIDL_WIDLTYPES_H
  98
  99 +#define S_OK           0
 100 +#define S_FALSE        1
 101 +#define E_OUTOFMEMORY  ((HRESULT)0x8007000EL)
 102 +#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L)
 103 +
 104 +#define max(a, b) ((a) > (b) ? a : b)
 105 +
 106  #include <stdarg.h>
 107  #include "guiddef.h"
 108  #include "wine/rpcfc.h"
 109  #include "wine/list.h"
 110
 111 --- write_msft.c        Sat Jan 05 20:48:36 2008
 112 +++ write_msft.c        Fri Jan 11 17:49:22 2008
 113 @@ -38,14 +38,12 @@
 114  #include <time.h>
 115
 116  #define NONAMELESSUNION
 117  #define NONAMELESSSTRUCT
 118
 119 -#include "winerror.h"
 120 -#include "windef.h"
 121 -#include "winbase.h"
 122 -#include "winnls.h"
 123 +#include <host/typedefs.h>
 124 +#include <host/nls.h>
 125
 126  #include "widltypes.h"
 127  #include "typelib.h"
 128  #include "typelib_struct.h"
 129  #include "utils.h"