reactos/dll/win32/version/version_ros.diff

   1 Index: info.c
   2 ===================================================================
   3 --- info.c      (revision 23123)
   4 +++ info.c      (working copy)
   5 @@ -30,6 +30,7 @@
   6  #include "winbase.h"
   7  #include "winver.h"
   8  #include "winternl.h"
   9 +#include "winuser.h"
  10  #include "wine/winuser16.h"
  11  #include "wine/unicode.h"
  12  #include "winerror.h"
  13 @@ -303,6 +304,7 @@
  14      return len;
  15  }
  16
  17 +#ifndef __REACTOS__
  18  /***********************************************************************
  19   *           VERSION_GetFileVersionInfo_16             [internal]
  20   *
  21 @@ -439,6 +442,7 @@
  22
  23      return len;
  24  }
  25 +#endif /* ! __REACTOS__ */
  26
  27  /***********************************************************************
  28   *           GetFileVersionInfoSizeW         [VERSION.@]
  29 @@ -472,6 +475,10 @@
  30
  31      if (!len)
  32      {
  33 +#ifdef __REACTOS__
  34 +        SetLastError(ERROR_FILE_NOT_FOUND);
  35 +        return 0;
  36 +#else /* __REACTOS__ */
  37          LPSTR filenameA;
  38
  39          len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
  40 @@ -503,6 +510,7 @@
  41           * doesn't seem to be a problem (len is bigger than info->wLength).
  42           */
  43           len = (len - sizeof(VS_FIXEDFILEINFO)) * 4;
  44 +#endif /* ! __REACTOS__ */
  45      }
  46      else
  47      {
  48 @@ -567,6 +575,10 @@
  49
  50      if (!len)
  51      {
  52 +#ifdef __REACTOS__
  53 +        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
  54 +        return FALSE;
  55 +#else /* __REACTOS__ */
  56          LPSTR filenameA;
  57
  58          len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
  59 @@ -582,6 +594,7 @@
  60              return FALSE;
  61          }
  62          /* We have a 16bit resource. */
  63 +#endif /* ! __REACTOS__ */
  64      }
  65      else
  66      {
  67 Index: resource.c
  68 ===================================================================
  69 --- resource.c  (revision 23123)
  70 +++ resource.c  (working copy)
  71 @@ -42,6 +42,9 @@
  72
  73  #include "wine/debug.h"
  74
  75 +/* winnt.h */
  76 +#define IMAGE_FILE_RESOURCE_DIRECTORY          2
  77 +
  78  WINE_DEFAULT_DEBUG_CHANNEL(ver);
  79
  80
  81 @@ -168,6 +171,7 @@
  82      return 0;
  83  }
  84
  85 +#ifndef __REACTOS__
  86  /***********************************************************************
  87   *           load_ne_resource         [internal]
  88   */
  89 @@ -266,6 +271,7 @@
  90      HeapFree( GetProcessHeap(), 0, resTab );
  91      return TRUE;
  92  }
  93 +#endif /* ! __REACTOS__ */
  94
  95  /***********************************************************************
  96   *           load_pe_resource         [internal]
  97 @@ -411,8 +416,13 @@
  98      switch ( read_xx_header( lzfd ) )
  99      {
 100      case IMAGE_OS2_SIGNATURE:
 101 +#ifdef __REACTOS__
 102 +        ERR("OS2 Images not supported under ReactOS at this time.");
 103 +        retv = 0;
 104 +#else
 105          retv = find_ne_resource( lzfd, lpszResType, lpszResId,
 106                                   &reslen, lpdwFileOffset );
 107 +#endif
 108          break;
 109
 110      case IMAGE_NT_SIGNATURE:
 111 @@ -450,8 +460,13 @@
 112          switch ( read_xx_header( lzfd ) )
 113          {
 114          case IMAGE_OS2_SIGNATURE:
 115 +#ifdef __REACTOS__
 116 +            ERR("OS2 Images not supported under ReactOS at this time.");
 117 +            retv = 0;
 118 +#else
 119              retv = find_ne_resource( lzfd, lpszResType, lpszResId,
 120                                       &reslen, &dwFileOffset );
 121 +#endif
 122              break;
 123
 124          case IMAGE_NT_SIGNATURE: