[ros-diffs] [sginsberg] 39013: - Revert the Wine code changes too, as requested on ML

Author: sginsberg
Date: Thu Jan 22 07:51:17 2009
New Revision: 39013

URL: http://svn.reactos.org/svn/reactos?rev=39013&view=rev
Log:
- Revert the Wine code changes too, as requested on ML

Removed:
    trunk/reactos/dll/win32/crypt32/crypt32_ros.diff
    trunk/reactos/dll/win32/ole32/ole32_ros.diff
Modified:
    trunk/reactos/dll/win32/crypt32/chain.c
    trunk/reactos/dll/win32/crypt32/main.c
    trunk/reactos/dll/win32/crypt32/rootstore.c
    trunk/reactos/dll/win32/cryptui/main.c
    trunk/reactos/dll/win32/ole32/marshal.c

Modified: trunk/reactos/dll/win32/crypt32/chain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Thu Jan 22 07:51:17 2009
@@ -205,7 +205,7 @@
 
         config.cbSize = sizeof(config);
         CertCreateCertificateChainEngine(&config, &engine);
-        (void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
+        InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
          NULL);
         if (CRYPT_defaultChainEngine != engine)
             CertFreeCertificateChainEngine(engine);

Removed: trunk/reactos/dll/win32/crypt32/crypt32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/crypt32_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/crypt32_ros.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);

Modified: trunk/reactos/dll/win32/crypt32/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Thu Jan 22 07:51:17 2009
@@ -66,7 +66,7 @@
 
         CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL,
          CRYPT_VERIFYCONTEXT);
-        (void)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
+        InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
          NULL);
         if (hDefProv != prov)
             CryptReleaseContext(prov, 0);

Modified: trunk/reactos/dll/win32/crypt32/rootstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Thu Jan 22 07:51:17 2009
@@ -759,7 +759,7 @@
     {
         HCERTSTORE root = create_root_store();
 
-        (void)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
+        InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
          NULL);
         if (CRYPT_rootStore != root)
             CertCloseStore(root, 0);

Modified: trunk/reactos/dll/win32/cryptui/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Thu Jan 22 07:51:17 2009
@@ -3277,9 +3277,6 @@
     LVCOLUMNW column;
     PurposeSelection purposeSelection;
 
-    /* hack for retarded gcc  */
-    purposeSelection = 0;
-
     GetWindowRect(lv, &rc);
     column.mask = LVCF_WIDTH;
     column.cx = rc.right - rc.left;

Modified: trunk/reactos/dll/win32/ole32/marshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?…
==============================================================================
--- trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] Thu Jan 22 07:51:17 2009
@@ -824,7 +824,7 @@
     } while (new_dest_context != old_dest_context);
 
     if (dest_context_data)
-        (void)InterlockedExchangePointer(&This->dest_context_data,
dest_context_data);
+        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
 }
 
 static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID
riid, void ** ppv)

Removed: trunk/reactos/dll/win32/ole32/ole32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole32_ros.diff [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole32_ros.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)