Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 03:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Revert the Wine code changes too, as requested on ML

Browse source 
svn path=/trunk/; revision=39013
This commit is contained in:
Stefan Ginsberg 2009-01-22 13:51:17 +00:00
parent 131ca9ba08
commit bcccb1d084
7 changed files with 4 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/crypt32/chain.c
View file

@ -205,7 +205,7 @@ static HCERTCHAINENGINE CRYPT_GetDefaultChainEngine(void)
config.cbSize = sizeof(config); config.cbSize = sizeof(config);
CertCreateCertificateChainEngine(&config, &engine); CertCreateCertificateChainEngine(&config, &engine);
(void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
NULL); NULL);
if (CRYPT_defaultChainEngine != engine) if (CRYPT_defaultChainEngine != engine)
CertFreeCertificateChainEngine(engine); CertFreeCertificateChainEngine(engine);

39
reactos/dll/win32/crypt32/crypt32_ros.diff
View file

@ -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);

2
reactos/dll/win32/crypt32/main.c
View file

@ -66,7 +66,7 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void)
CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT); CRYPT_VERIFYCONTEXT);
(void)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
NULL); NULL);
if (hDefProv != prov) if (hDefProv != prov)
CryptReleaseContext(prov, 0); CryptReleaseContext(prov, 0);

2
reactos/dll/win32/crypt32/rootstore.c
View file

@ -759,7 +759,7 @@ PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags)
{ {
HCERTSTORE root = create_root_store(); HCERTSTORE root = create_root_store();
(void)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
NULL); NULL);
if (CRYPT_rootStore != root) if (CRYPT_rootStore != root)
CertCloseStore(root, 0); CertCloseStore(root, 0);

3
reactos/dll/win32/cryptui/main.c
View file

@ -3277,9 +3277,6 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data)
LVCOLUMNW column; LVCOLUMNW column;
PurposeSelection purposeSelection; PurposeSelection purposeSelection;
/* hack for retarded gcc */
purposeSelection = 0;
GetWindowRect(lv, &rc); GetWindowRect(lv, &rc);
column.mask = LVCF_WIDTH; column.mask = LVCF_WIDTH;
column.cx = rc.right - rc.left; column.cx = rc.right - rc.left;

2
reactos/dll/win32/ole32/marshal.c
View file

@ -824,7 +824,7 @@ static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX
} while (new_dest_context != old_dest_context); } while (new_dest_context != old_dest_context);
if (dest_context_data) 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) static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv)

13
reactos/dll/win32/ole32/ole32_ros.diff
View file

@ -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)