summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/fix-cairo-win32-print-gdi-error.diff
diff options
context:
space:
mode:
authorMatt A. Tobin <mattatobin@localhost.localdomain>2018-02-02 04:16:08 -0500
committerMatt A. Tobin <mattatobin@localhost.localdomain>2018-02-02 04:16:08 -0500
commit5f8de423f190bbb79a62f804151bc24824fa32d8 (patch)
tree10027f336435511475e392454359edea8e25895d /gfx/cairo/fix-cairo-win32-print-gdi-error.diff
parent49ee0794b5d912db1f95dce6eb52d781dc210db5 (diff)
downloadUXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.gz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.lz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.xz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.zip
Add m-esr52 at 52.6.0
Diffstat (limited to 'gfx/cairo/fix-cairo-win32-print-gdi-error.diff')
-rw-r--r--gfx/cairo/fix-cairo-win32-print-gdi-error.diff26
1 files changed, 26 insertions, 0 deletions
diff --git a/gfx/cairo/fix-cairo-win32-print-gdi-error.diff b/gfx/cairo/fix-cairo-win32-print-gdi-error.diff
new file mode 100644
index 000000000..9387a87af
--- /dev/null
+++ b/gfx/cairo/fix-cairo-win32-print-gdi-error.diff
@@ -0,0 +1,26 @@
+diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
+--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
++++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
+@@ -95,20 +95,21 @@ _cairo_win32_print_gdi_error (const char
+ FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ last_error,
+ MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPSTR) &lpMsgBuf,
+ 0, NULL)) {
+ fprintf (stderr, "%s: Unknown GDI error", context);
+ } else {
+- fwprintf (stderr, "%S: %s", context, (char *)lpMsgBuf);
++ fprintf (stderr, "%s: %S", context, (char *)lpMsgBuf);
+
+ LocalFree (lpMsgBuf);
+ }
++ fflush(stderr);
+
+ /* We should switch off of last_status, but we'd either return
+ * CAIRO_STATUS_NO_MEMORY or CAIRO_STATUS_UNKNOWN_ERROR and there
+ * is no CAIRO_STATUS_UNKNOWN_ERROR.
+ */
+
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+ }