Define TRUE only if it hasn't been defined before

[reactos.git] / reactos / tools / widl / widl_ros.diff

diff --git a/reactos/tools/widl/widl_ros.diff b/reactos/tools/widl/widl_ros.diff
index 27ebfa2..fa681a0 100644 (file)
--- a/reactos/tools/widl/widl_ros.diff
+++ b/reactos/tools/widl/widl_ros.diff
@@ -1,8 +1,19 @@
---- hash.c     Fri Sep 29 17:48:44 2006
-+++ hash.c     Sat Jan 05 21:25:37 2008
-@@ -533,17 +533,24 @@
-   case LANG_ROMANIAN:   case LANG_SANSKRIT:   case LANG_SERBIAN:
-   case LANG_SINDHI:     case LANG_SLOVENIAN:  case LANG_SWAHILI:
+Index: hash.c
+===================================================================
+--- hash.c     (revision 32187)
++++ hash.c     (working copy)
+@@ -21,9 +21,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
+-#include "windef.h"
+-#include "winbase.h"
+-#include "winnls.h"
++#include <host/nls.h>
+ 
+ #include "hash.h"
+ 
+@@ -535,6 +533,7 @@
    case LANG_SWEDISH:    case LANG_SYRIAC:     case LANG_TAMIL:
    case LANG_TATAR:      case LANG_TELUGU:     case LANG_THAI:
    case LANG_UKRAINIAN:  case LANG_URDU:       case LANG_UZBEK:
@@ -10,7 +21,7 @@
    case LANG_VIETNAMESE: case LANG_GAELIC:     case LANG_MALTESE:
    case LANG_TAJIK:      case LANG_ROMANSH:    case LANG_IRISH:
    case LANG_SAMI:       case LANG_UPPER_SORBIAN: case LANG_SUTU:
-   case LANG_TSONGA:     case LANG_TSWANA:     case LANG_VENDA:
+@@ -542,6 +541,12 @@
    case LANG_XHOSA:      case LANG_ZULU:       case LANG_ESPERANTO:
    case LANG_WALON:      case LANG_CORNISH:    case LANG_WELSH:
    case LANG_BRETON:
@@ -23,13 +34,11 @@
      nOffset = 16;
      pnLookup = Lookup_16;
      break;
-   case LANG_CZECH:  case LANG_HUNGARIAN:  case LANG_POLISH:
-   case LANG_SLOVAK: case LANG_SPANISH:
---- server.c   Sat Jan 05 20:48:36 2008
-+++ server.c   Sat Jan 05 22:44:57 2008
-@@ -388,10 +388,11 @@
-         error("Could not open %s for output\n", server_name);
- 
+Index: server.c
+===================================================================
+--- server.c   (revision 32187)
++++ server.c   (working copy)
+@@ -390,6 +390,7 @@
      print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name);
      print_server("#include <string.h>\n");
      fprintf(server, "\n");
@@ -37,23 +46,94 @@
      print_server("#include \"%s\"\n", header_name);
      fprintf(server, "\n");
  }
+Index: typelib.c
+===================================================================
+--- typelib.c  (revision 32187)
++++ typelib.c  (working copy)
+@@ -35,8 +35,7 @@
+ #define NONAMELESSUNION
+ #define NONAMELESSSTRUCT
  
+-#include "windef.h"
+-#include "winbase.h"
++#include <host/typedefs.h>
  
---- widl.c     Sat Jan 05 20:48:36 2008
-+++ widl.c     Sat Jan 05 23:44:29 2008
-@@ -547,10 +547,15 @@
-       return 1;
-     }
+ #include "widl.h"
+ #include "utils.h"
+Index: widl.c
+===================================================================
+--- widl.c     (revision 32187)
++++ widl.c     (working copy)
+@@ -174,7 +174,7 @@
+   token = xstrdup(name);
+   for (i=0; token[i]; i++) {
+     if (!isalnum(token[i])) token[i] = '_';
+-    else token[i] = toupper(token[i]);
++    else token[i] = tolower(token[i]);
+   }
+   return token;
+ }
+@@ -561,8 +561,8 @@
+     fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name);
+     fprintf(header, "#include <rpc.h>\n" );
+     fprintf(header, "#include <rpcndr.h>\n\n" );
+-    fprintf(header, "#ifndef __WIDL_%s\n", header_token);
+-    fprintf(header, "#define __WIDL_%s\n", header_token);
++    fprintf(header, "#ifndef __%s__\n", header_token);
++    fprintf(header, "#define __%s__\n", header_token);
+     start_cplusplus_guard(header);
    }
+
+@@ -606,7 +606,7 @@
+     fprintf(header, "/* End additional prototypes */\n");
+     fprintf(header, "\n");
+     end_cplusplus_guard(header);
+-    fprintf(header, "#endif /* __WIDL_%s */\n", header_token);
++    fprintf(header, "#endif /* __%s__ */\n", header_token);
+     fclose(header);
+   }
+Index: widltypes.h
+===================================================================
+--- widltypes.h        (revision 32187)
++++ widltypes.h        (working copy)
+@@ -21,6 +21,13 @@
+ #ifndef __WIDL_WIDLTYPES_H
+ #define __WIDL_WIDLTYPES_H
+ 
++#define S_OK           0
++#define S_FALSE        1
++#define E_OUTOFMEMORY  ((HRESULT)0x8007000EL)
++#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L)
++
++#define max(a, b) ((a) > (b) ? a : b)
++
+ #include <stdarg.h>
+ #include "guiddef.h"
+ #include "wine/rpcfc.h"
+@@ -38,7 +38,9 @@
+ typedef GUID UUID;
+ #endif
+ 
++#ifndef TRUE
+ #define TRUE 1
++#endif
+ #define FALSE 0
+ 
+ typedef struct _attr_t attr_t;
+Index: write_msft.c
+===================================================================
+--- write_msft.c       (revision 32187)
++++ write_msft.c       (working copy)
+@@ -40,10 +40,8 @@
+ #define NONAMELESSUNION
+ #define NONAMELESSSTRUCT
+ 
+-#include "winerror.h"
+-#include "windef.h"
+-#include "winbase.h"
+-#include "winnls.h"
++#include <host/typedefs.h>
++#include <host/nls.h>
  
-   if(do_header) {
-+    if (strrchr(header_name, '\\'))
-+        header_token = make_token(strrchr(header_name, '\\') + 1);
-+    else if (strrchr(header_name, '/'))
-+        header_token = make_token(strrchr(header_name, '/') + 1);
-+    else
-     header_token = make_token(header_name);
- 
-     if(!(header = fopen(header_name, "w"))) {
-       fprintf(stderr, "Could not open %s for output\n", header_name);
-       return 1;
+ #include "widltypes.h"
+ #include "typelib.h"