Changeset 22496 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine

Timestamp:

Aug 27, 2009 8:57:47 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: update wine to 1.1.27 and better fix for depthstencil surface refcounting

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine

Files:

• cptable.c (modified) (1 diff)
• defaults (modified) (1 diff)
• loader.c (modified) (2 diffs)
• mbtowc.c (modified) (1 diff)
• string.c (modified) (1 diff)
• utf8.c (modified) (1 diff)
• version.c (modified) (1 diff)
• wctomb.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cptable.c

@@ -27 +27 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
+#include "config.h"
+#include "wine/port.h"
 
 #include <stdlib.h>

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/defaults

@@ -34 +34 @@
 # are handled automatically and do not have to be defined here. They can
 # still be defined if necessary to override the unicode decomposition.
+#
+
+#
+# Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+# other than GPL or LGPL is available it will apply instead, Sun elects to use only
+# the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
+# a choice of LGPL license versions is made available with the language indicating
+# that LGPLv2 or any later version may be used, or where a choice of which version
+# of the LGPL is applied is otherwise unspecified.
 #
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/loader.c

@@ -59 +59 @@
 #define environ (*_NSGetEnviron())
 #else
+# ifndef _MSC_VER
 extern char **environ;
+# endif
 #endif
 
@@ -458 +460 @@
 char **__wine_get_main_environment(void)
 {
+#ifndef _MSC_VER
     return environ;
+#else
+    return _environ;
+#endif
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mbtowc.c

@@ -28 +28 @@
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/string.c

@@ -27 +27 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
+#include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/utf8.c

@@ -28 +28 @@
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/version.c

@@ -1 @@
-const char wine_build[] = "wine-1.1.26";
+const char wine_build[] = "wine-1.1.27";

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/wctomb.c

@@ -28 +28 @@
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 
@@ -79 +82 @@
                                          WCHAR wch, unsigned char ch )
 {
-    if (flags & WC_NO_BEST_FIT_CHARS) return (table->cp2uni[ch] == wch);
-    if (ch != (unsigned char)table->info.def_char) return 1;
-    return (wch == table->info.def_unicode_char);
+    if ((flags & WC_NO_BEST_FIT_CHARS) || ch == (unsigned char)table->info.def_char)
+        return (table->cp2uni[ch] == wch);
+    return 1;
 }
 
@@ -272 +275 @@
                                          WCHAR wch, unsigned short ch )
 {
-    if (ch == table->info.def_char && wch != table->info.def_unicode_char) return 0;
-    if (flags & WC_NO_BEST_FIT_CHARS)
+    if ((flags & WC_NO_BEST_FIT_CHARS) || ch == table->info.def_char)
     {
         /* check if char maps back to the same Unicode value */