Fix remaining text file line endings in the tree. (#18)

[reactos.git] / dll / win32 / comdlg32 / comdlg32_ros.diff

diff --git a/dll/win32/comdlg32/comdlg32_ros.diff b/dll/win32/comdlg32/comdlg32_ros.diff
index dceaf5b..58b0080 100644 (file)
--- a/dll/win32/comdlg32/comdlg32_ros.diff
+++ b/dll/win32/comdlg32/comdlg32_ros.diff
@@ -1,66 +1,54 @@
-diff -prudN e:\Wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c\r
---- e:\Wine\dlls\comdlg32/cdlg32.c     2013-10-26 22:24:27.508648000 +0100\r
-+++ e:\reactos\dll\win32\comdlg32/cdlg32.c     2014-03-05 11:46:06.260510700 +0100\r
-@@ -174,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void)\r
-         return 0; /* we never set an error, so there isn't one */\r
- }\r
- \r
-+#ifndef __REACTOS__ /* Win 7 */\r
-+\r
- /*************************************************************************\r
-  * Implement the CommDlg32 class factory\r
-  *\r
-@@ -283,7 +268,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI\r
-  */\r
- HRESULT WINAPI DllRegisterServer(void)\r
- {\r
--    return __wine_register_resources(COMDLG32_hInstance);\r
-+    return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);\r
- }\r
- \r
- /***********************************************************************\r
-@@ -291,5 +276,7 @@ HRESULT WINAPI DllRegisterServer(void)\r
-  */\r
- HRESULT WINAPI DllUnregisterServer(void)\r
- {\r
--    return __wine_unregister_resources(COMDLG32_hInstance);\r
-+    return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);\r
- }\r
-+\r
-+#endif /* Win 7 */\r
-\r
-diff -prudN e:\Wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec\r
---- e:\Wine\dlls\comdlg32/comdlg32.spec        2011-09-16 23:22:36.026770600 +0100\r
-+++ e:\reactos\dll\win32\comdlg32/comdlg32.spec        2012-02-15 22:32:22.456422900 +0100\r
-@@ -3,9 +3,9 @@\r
- @ stdcall ChooseFontA(ptr)\r
- @ stdcall ChooseFontW(ptr)\r
- @ stdcall CommDlgExtendedError()\r
--@ stdcall -private DllGetClassObject(ptr ptr ptr)\r
--@ stdcall -private DllRegisterServer()\r
--@ stdcall -private DllUnregisterServer()\r
-+;@ stdcall -private DllGetClassObject(ptr ptr ptr) ; Win 7\r
-+;@ stdcall -private DllRegisterServer() ; Win 7\r
-+;@ stdcall -private DllUnregisterServer() ; Win 7\r
- @ stdcall FindTextA(ptr)\r
- @ stdcall FindTextW(ptr)\r
- @ stdcall GetFileTitleA(str ptr long)\r
-\r
-diff -prudN e:\Wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c\r
---- e:\Wine\dlls\comdlg32/itemdlg.c    2013-10-26 22:24:27.515652700 +0100\r
-+++ e:\reactos\dll\win32\comdlg32/itemdlg.c    2013-10-15 19:32:27.803008200 +0100\r
-@@ -18,6 +18,8 @@\r
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA\r
-  */\r
- \r
-+#ifndef __REACTOS__ /* Win 7 */\r
-+\r
- #include <stdarg.h>\r
- \r
- #define COBJMACROS\r
-@@ -3660,3 +3662,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn\r
- {\r
-     return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);\r
- }\r
-+\r
-+#endif /* Win 7 */\r
+diff -pudN e:\wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c
+--- e:\wine\dlls\comdlg32/cdlg32.c     2016-11-16 17:28:42 +0100
++++ e:\reactos\dll\win32\comdlg32/cdlg32.c     2015-08-27 22:02:19 +0100
+@@ -157,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void)
+         return 0; /* we never set an error, so there isn't one */
+ }
+ 
++#ifndef __REACTOS__ /* Win 7 */
++
+ /*************************************************************************
+  * Implement the CommDlg32 class factory
+  *
+@@ -266,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
+  */
+ HRESULT WINAPI DllRegisterServer(void)
+ {
++#ifdef __REACTOS__
++    return E_FAIL; // FIXME: __wine_register_resources(COMDLG32_hInstance);
++#else
+     return __wine_register_resources(COMDLG32_hInstance);
++#endif
+ }
+ 
+ /***********************************************************************
+@@ -274,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void)
+  */
+ HRESULT WINAPI DllUnregisterServer(void)
+ {
++#ifdef __REACTOS__
++    return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance);
++#else
+     return __wine_unregister_resources(COMDLG32_hInstance);
++#endif
+ }
++
++#endif /* Win 7 */
+diff -pudN e:\wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c
+--- e:\wine\dlls\comdlg32/itemdlg.c    2016-08-14 19:11:13 +0100
++++ e:\reactos\dll\win32\comdlg32/itemdlg.c    2016-08-15 16:16:18 +0100
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++#ifndef __REACTOS__ /* Win 7 */
++
+ #include <stdarg.h>
+ 
+ #define COBJMACROS
+@@ -4659,3 +4661,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn
+ {
+     return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE);
+ }
++
++#endif /* Win 7 */