From bcccb1d08413fc2eb9d6b0150add13fee4d62ad1 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Thu, 22 Jan 2009 13:51:17 +0000 Subject: [PATCH] - Revert the Wine code changes too, as requested on ML svn path=/trunk/; revision=39013 --- reactos/dll/win32/crypt32/chain.c | 2 +- reactos/dll/win32/crypt32/crypt32_ros.diff | 39 ---------------------- reactos/dll/win32/crypt32/main.c | 2 +- reactos/dll/win32/crypt32/rootstore.c | 2 +- reactos/dll/win32/cryptui/main.c | 3 -- reactos/dll/win32/ole32/marshal.c | 2 +- reactos/dll/win32/ole32/ole32_ros.diff | 13 -------- 7 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 reactos/dll/win32/crypt32/crypt32_ros.diff delete mode 100644 reactos/dll/win32/ole32/ole32_ros.diff diff --git a/reactos/dll/win32/crypt32/chain.c b/reactos/dll/win32/crypt32/chain.c index 7f9fec95234..e7133620573 100644 --- a/reactos/dll/win32/crypt32/chain.c +++ b/reactos/dll/win32/crypt32/chain.c @@ -205,7 +205,7 @@ static HCERTCHAINENGINE CRYPT_GetDefaultChainEngine(void) config.cbSize = sizeof(config); CertCreateCertificateChainEngine(&config, &engine); - (void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, + InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, NULL); if (CRYPT_defaultChainEngine != engine) CertFreeCertificateChainEngine(engine); diff --git a/reactos/dll/win32/crypt32/crypt32_ros.diff b/reactos/dll/win32/crypt32/crypt32_ros.diff deleted file mode 100644 index 125f9e91ee8..00000000000 --- a/reactos/dll/win32/crypt32/crypt32_ros.diff +++ /dev/null @@ -1,39 +0,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); diff --git a/reactos/dll/win32/crypt32/main.c b/reactos/dll/win32/crypt32/main.c index 4cf7fa31637..d93163c1936 100644 --- a/reactos/dll/win32/crypt32/main.c +++ b/reactos/dll/win32/crypt32/main.c @@ -66,7 +66,7 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void) 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); diff --git a/reactos/dll/win32/crypt32/rootstore.c b/reactos/dll/win32/crypt32/rootstore.c index c96e9e6c79c..116c9341139 100644 --- a/reactos/dll/win32/crypt32/rootstore.c +++ b/reactos/dll/win32/crypt32/rootstore.c @@ -759,7 +759,7 @@ PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) { HCERTSTORE root = create_root_store(); - (void)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, + InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, NULL); if (CRYPT_rootStore != root) CertCloseStore(root, 0); diff --git a/reactos/dll/win32/cryptui/main.c b/reactos/dll/win32/cryptui/main.c index c3f9440e871..a5fb5808b4f 100644 --- a/reactos/dll/win32/cryptui/main.c +++ b/reactos/dll/win32/cryptui/main.c @@ -3277,9 +3277,6 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) LVCOLUMNW column; PurposeSelection purposeSelection; - /* hack for retarded gcc */ - purposeSelection = 0; - GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH; column.cx = rc.right - rc.left; diff --git a/reactos/dll/win32/ole32/marshal.c b/reactos/dll/win32/ole32/marshal.c index 014ae6311e1..42ea68d453c 100644 --- a/reactos/dll/win32/ole32/marshal.c +++ b/reactos/dll/win32/ole32/marshal.c @@ -824,7 +824,7 @@ static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX } 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) diff --git a/reactos/dll/win32/ole32/ole32_ros.diff b/reactos/dll/win32/ole32/ole32_ros.diff deleted file mode 100644 index db19d3486f8..00000000000 --- a/reactos/dll/win32/ole32/ole32_ros.diff +++ /dev/null @@ -1,13 +0,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)