Guest User

Untitled

a guest
Aug 10th, 2011
176
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.86 KB | None | 0 0
  1. diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
  2. index 42b3639..7484608 100644
  3. --- a/dlls/ntdll/directory.c
  4. +++ b/dlls/ntdll/directory.c
  5. @@ -3145,14 +3145,14 @@ static void WINAPI read_changes_user_apc( void *arg, IO_STATUS_BLOCK *io, ULONG
  6.  static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc )
  7.  {
  8.      struct read_changes_info *info = user;
  9. -    char data[PATH_MAX];
  10. +    char data[4096];
  11.      NTSTATUS ret;
  12.      int size;
  13.  
  14.      SERVER_START_REQ( read_change )
  15.      {
  16.          req->handle = wine_server_obj_handle( info->FileHandle );
  17. -        wine_server_set_reply( req, data, PATH_MAX );
  18. +        wine_server_set_reply( req, data, 4096 );
  19.          ret = wine_server_call( req );
  20.          size = wine_server_reply_size( reply );
  21.      }
  22. diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
  23. index 6c8e8e2..e949227 100644
  24. --- a/dlls/ntdll/signal_i386.c
  25. +++ b/dlls/ntdll/signal_i386.c
  26. @@ -180,6 +180,36 @@ __ASM_GLOBAL_FUNC(vm86_enter,
  27.  
  28.  #endif  /* linux */
  29.  
  30. +#ifdef __GNU__
  31. +
  32. +typedef ucontext_t SIGCONTEXT;
  33. +
  34. +#define EAX_sig(context)     ((context)->uc_mcontext.gregs[REG_EAX])
  35. +#define EBX_sig(context)     ((context)->uc_mcontext.gregs[REG_EBX])
  36. +#define ECX_sig(context)     ((context)->uc_mcontext.gregs[REG_ECX])
  37. +#define EDX_sig(context)     ((context)->uc_mcontext.gregs[REG_EDX])
  38. +#define ESI_sig(context)     ((context)->uc_mcontext.gregs[REG_ESI])
  39. +#define EDI_sig(context)     ((context)->uc_mcontext.gregs[REG_EDI])
  40. +#define EBP_sig(context)     ((context)->uc_mcontext.gregs[REG_EBP])
  41. +#define ESP_sig(context)     ((context)->uc_mcontext.gregs[REG_ESP])
  42. +
  43. +#define CS_sig(context)      ((context)->uc_mcontext.gregs[REG_CS])
  44. +#define DS_sig(context)      ((context)->uc_mcontext.gregs[REG_DS])
  45. +#define ES_sig(context)      ((context)->uc_mcontext.gregs[REG_ES])
  46. +#define SS_sig(context)      ((context)->uc_mcontext.gregs[REG_SS])
  47. +#define FS_sig(context)      ((context)->uc_mcontext.gregs[REG_FS])
  48. +#define GS_sig(context)      ((context)->uc_mcontext.gregs[REG_GS])
  49. +
  50. +#define EFL_sig(context)     ((context)->uc_mcontext.gregs[REG_EFL])
  51. +#define EIP_sig(context)     ((context)->uc_mcontext.gregs[REG_EIP])
  52. +#define TRAP_sig(context)    ((context)->uc_mcontext.gregs[REG_TRAPNO])
  53. +#define ERROR_sig(context)   ((context)->uc_mcontext.gregs[REG_ERR])
  54. +
  55. +#define FPU_sig(context)     ((FLOATING_SAVE_AREA *)&(context)->uc_mcontext.fpregs.fp_reg_set.fpchip_state)
  56. +#define FPUX_sig(context)    NULL
  57. +
  58. +#endif  /* __GNU__ */
  59. +
  60.  #ifdef BSDI
  61.  
  62.  #include <machine/frame.h>
  63. diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
  64. index 9649df8..cdd1798 100644
  65. --- a/dlls/shell32/shfldr_unixfs.c
  66. +++ b/dlls/shell32/shfldr_unixfs.c
  67. @@ -369,7 +369,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) {
  68.  static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath)
  69.  {
  70.      char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, has_failed = 0, mb_path[FILENAME_MAX];
  71. -    WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[PATH_MAX], *dospath_end;
  72. +    WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[MAX_PATH], *dospath_end;
  73.      int cDriveSymlinkLen;
  74.      void *redir;
  75.  
  76. diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
  77. index ad8e08b..a8d6329 100644
  78. --- a/dlls/winex11.drv/xrender.c
  79. +++ b/dlls/winex11.drv/xrender.c
  80. @@ -2440,8 +2440,8 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev)
  81.    return;
  82.  }
  83.  
  84. -BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc,
  85. -                         struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn )
  86. +BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst,
  87. +                         X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn )
  88.  {
  89.    FIXME("not supported - XRENDER headers were missing at compile time\n");
  90.    return FALSE;
  91. diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c
  92. index 3098061..b3fee13 100644
  93. --- a/libs/wine/ldt.c
  94. +++ b/libs/wine/ldt.c
  95. @@ -96,6 +96,11 @@ static inline int set_thread_area( struct modify_ldt_s *ptr )
  96.  #include <i386/user_ldt.h>
  97.  #endif
  98.  
  99. +#ifdef __GNU__
  100. +#include <mach/i386/mach_i386.h>
  101. +#include <mach/mach_traps.h>
  102. +#endif
  103. +
  104.  /* local copy of the LDT */
  105.  #ifdef __APPLE__
  106.  struct __wine_ldt_copy wine_ldt_copy = { { 0, 0, 0 } };
  107. @@ -203,6 +208,9 @@ static int internal_set_entry( unsigned short sel, const LDT_ENTRY *entry )
  108.  #elif defined(__APPLE__)
  109.      if ((ret = i386_set_ldt(index, (union ldt_entry *)entry, 1)) < 0)
  110.          perror("i386_set_ldt");
  111. +#elif defined(__GNU__)
  112. +    if ((ret = i386_set_ldt(mach_thread_self(), sel, (descriptor_list_t)entry, 1)) != KERN_SUCCESS)
  113. +        perror("i386_set_ldt");
  114.  #else
  115.      fprintf( stderr, "No LDT support on this platform\n" );
  116.      exit(1);
Advertisement
Add Comment
Please, Sign In to add comment