[ros-diffs] [sginsberg] 38979: - Fix my .diff mess from yesterday, sorry

Author: sginsberg
Date: Tue Jan 20 09:48:54 2009
New Revision: 38979

URL: http://svn.reactos.org/svn/reactos?rev=38979&view=rev
Log:
- Fix my .diff mess from yesterday, sorry

Added:
    trunk/reactos/dll/win32/crypt32/crypt32_ros.diff
      - copied unchanged from r38978, trunk/reactos/dll/win32/crypt32/warningfixes.diff
    trunk/reactos/dll/win32/ole32/ole32_ros.diff
      - copied unchanged from r38978, trunk/reactos/dll/win32/ole32/warningfix.diff
Removed:
    trunk/reactos/dll/win32/crypt32/warningfixes.diff
    trunk/reactos/dll/win32/ole32/warningfix.diff
Modified:
    trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff

Removed: trunk/reactos/dll/win32/crypt32/warningfixes.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/warningf…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/warningfixes.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/warningfixes.diff (removed)
@@ -1,39 +1,0 @@
-Index: chain.c
-===================================================================
---- chain.c	(revision 38919)
-+++ chain.c	(working copy)
-@@ -205,7 +205,7 @@
- 
-         config.cbSize = sizeof(config);
-         CertCreateCertificateChainEngine(&config, &engine);
--        InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
-+        (void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
-          NULL);
-         if (CRYPT_defaultChainEngine != engine)
-             CertFreeCertificateChainEngine(engine);
-Index: main.c
-===================================================================
---- main.c	(revision 38919)
-+++ main.c	(working copy)
-@@ -66,7 +66,7 @@
- 
-         CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL,
-          CRYPT_VERIFYCONTEXT);
--        InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
-+        (void)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
-          NULL);
-         if (hDefProv != prov)
-             CryptReleaseContext(prov, 0);
-Index: rootstore.c
-===================================================================
---- rootstore.c	(revision 38919)
-+++ rootstore.c	(working copy)
-@@ -759,7 +759,7 @@
-     {
-         HCERTSTORE root = create_root_store();
- 
--        InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
-+        (void)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
-          NULL);
-         if (CRYPT_rootStore != root)
-             CertCloseStore(root, 0);

Removed: trunk/reactos/dll/win32/ole32/warningfix.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/warningfix…
==============================================================================
--- trunk/reactos/dll/win32/ole32/warningfix.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/warningfix.diff (removed)
@@ -1,13 +1,0 @@
-Index: marshal.c
-===================================================================
---- marshal.c	(revision 38899)
-+++ marshal.c	(working copy)
-@@ -824,7 +824,7 @@
-     } while (new_dest_context != old_dest_context);
- 
-     if (dest_context_data)
--        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
-+        (void)InterlockedExchangePointer(&This->dest_context_data,
dest_context_data);
- }
- 
- static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID
riid, void ** ppv)

Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3…
==============================================================================
--- trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff [iso-8859-1] Tue Jan 20 09:48:54
2009
@@ -72,3 +72,15 @@
  
  /*
   * FIXME:
+Index: oleaut32.rbuild
+===================================================================
+--- oleaut32.rbuild	(revision 23782)
++++ oleaut32.rbuild	(working copy)
+@@ -43,6 +43,7 @@
+ 	<library>comctl32</library>
+ 	<library>urlmon</library>
+ 	<library>uuid</library>
++	<library>pseh</library>
+ </module>
+ <module name="oleaut32_oleaut32_oaidl_proxy" type="rpcproxy"
allowwarnings="true">
+ 	<file>oleaut32_oaidl.idl</file>