Git conversion: Make reactos the root directory, move rosapps, rostests, wallpapers...

[reactos.git] / reactos / dll / win32 / gdiplus / gdiplus_ros.diff

diff --git a/reactos/dll/win32/gdiplus/gdiplus_ros.diff b/reactos/dll/win32/gdiplus/gdiplus_ros.diff
deleted file mode 100644 (file)
index ffecf44..0000000
--- a/reactos/dll/win32/gdiplus/gdiplus_ros.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: graphics.c\r
-===================================================================\r
---- graphics.c  (revision 57285)\r
-+++ graphics.c  (working copy)\r
-@@ -42,6 +42,23 @@\r
-\r
- WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);\r
-\r
-+/* Mike "tamlin" Nordell 2012-09-14 for ReactOS:\r
-+ * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in\r
-+ * every GpGraphics). Windows seems to use process-global id's, or at\r
-+ * least more unique id's.\r
-+ * This have the following implications. It:\r
-+ * 1. fails the current gdiplus test case.\r
-+ * 2. is not what Windows does.\r
-+ *\r
-+ * We therefore "obfuscate" the 'contid' a little to more match Windows'\r
-+ * behaviour. The observable behviour should still remain the same,\r
-+ * except for handing out more "unique" id's.\r
-+ */\r
-+#define GDIP_CONTID_STEP 64\r
-+static volatile LONG g_priv_contid = GDIP_CONTID_STEP;\r
-+#define GDIP_GET_NEW_CONTID_FOR(pGpGraphics) \\r
-+   (UINT)(InterlockedExchangeAdd(&g_priv_contid,GDIP_CONTID_STEP))\r
-+\r
- /* looks-right constants */\r
- #define ANCHOR_WIDTH (2.0)\r
- #define MAX_ITERS (50)\r
-@@ -2203,7 +2220,7 @@\r
-     (*graphics)->busy = FALSE;\r
-     (*graphics)->textcontrast = 4;\r
-     list_init(&(*graphics)->containers);\r
--    (*graphics)->contid = 0;\r
-+    (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics);\r
-\r
-     TRACE("<-- %p\n", *graphics);\r
-\r
-@@ -2242,7 +2259,7 @@\r
-     (*graphics)->busy = FALSE;\r
-     (*graphics)->textcontrast = 4;\r
-     list_init(&(*graphics)->containers);\r
--    (*graphics)->contid = 0;\r
-+    (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics);\r
-\r
-     TRACE("<-- %p\n", *graphics);\r