From fb169370fe29802f97cc6660b8396158d87688b3 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sun, 18 Jan 2009 23:31:26 +0000 Subject: [PATCH] - Fix more InterlockedCompareExchangePointer warnings in crypt32 -- this to Wine, too - Hack-0-initialize a variable in cryptui to satisfy gcc -- this needed as Wine use a less retarded gcc than we do - Warning fix old and out of sync icmp/inetcomm/odbc32/shdocw - Use _CRT_NONSTDC_NO_DEPRECATE in winhlp32 - Hack MAKEINTATOM definition for Wine svn path=/trunk/; revision=38922 --- .../applications/winhlp32/winhlp32.rbuild | 5 ++- reactos/dll/win32/credui/credui.rbuild | 2 - reactos/dll/win32/crypt32/chain.c | 2 +- reactos/dll/win32/crypt32/main.c | 2 +- reactos/dll/win32/crypt32/rootstore.c | 2 +- reactos/dll/win32/crypt32/warningfixes.diff | 39 +++++++++++++++++++ reactos/dll/win32/cryptui/main.c | 3 ++ reactos/dll/win32/icmp/icmp.rbuild | 2 +- reactos/dll/win32/icmp/icmp_main.c | 6 +-- reactos/dll/win32/inetcomm/inetcomm.rbuild | 2 +- reactos/dll/win32/inetcomm/mimeintl.c | 4 +- reactos/dll/win32/odbc32/odbc32.rbuild | 2 +- reactos/dll/win32/odbc32/proxyodbc.c | 14 ++++--- reactos/dll/win32/shdocvw/shdocvw.rbuild | 2 +- reactos/dll/win32/shdocvw/shdocvw_main.c | 2 +- reactos/include/psdk/winbase.h | 6 +++ 16 files changed, 73 insertions(+), 22 deletions(-) create mode 100644 reactos/dll/win32/crypt32/warningfixes.diff diff --git a/reactos/base/applications/winhlp32/winhlp32.rbuild b/reactos/base/applications/winhlp32/winhlp32.rbuild index 475b625a816..e70b5486df7 100644 --- a/reactos/base/applications/winhlp32/winhlp32.rbuild +++ b/reactos/base/applications/winhlp32/winhlp32.rbuild @@ -1,9 +1,10 @@ - + . include/reactos/wine - + + wine comdlg32 comctl32 diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild index 79a559cbaa8..7222e4d3afa 100644 --- a/reactos/dll/win32/credui/credui.rbuild +++ b/reactos/dll/win32/credui/credui.rbuild @@ -6,8 +6,6 @@ . include/reactos/wine - 0x600 - 0x600 credui_main.c credui.rc wine diff --git a/reactos/dll/win32/crypt32/chain.c b/reactos/dll/win32/crypt32/chain.c index e7133620573..7f9fec95234 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); - InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, + (void)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, NULL); if (CRYPT_defaultChainEngine != engine) CertFreeCertificateChainEngine(engine); diff --git a/reactos/dll/win32/crypt32/main.c b/reactos/dll/win32/crypt32/main.c index d93163c1936..4cf7fa31637 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); - InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, + (void)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 116c9341139..c96e9e6c79c 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(); - 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/warningfixes.diff b/reactos/dll/win32/crypt32/warningfixes.diff new file mode 100644 index 00000000000..125f9e91ee8 --- /dev/null +++ b/reactos/dll/win32/crypt32/warningfixes.diff @@ -0,0 +1,39 @@ +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/cryptui/main.c b/reactos/dll/win32/cryptui/main.c index a5fb5808b4f..c3f9440e871 100644 --- a/reactos/dll/win32/cryptui/main.c +++ b/reactos/dll/win32/cryptui/main.c @@ -3277,6 +3277,9 @@ 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/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild index 9800bfb09b2..5cb14fb878d 100644 --- a/reactos/dll/win32/icmp/icmp.rbuild +++ b/reactos/dll/win32/icmp/icmp.rbuild @@ -1,4 +1,4 @@ - + . include/reactos/wine diff --git a/reactos/dll/win32/icmp/icmp_main.c b/reactos/dll/win32/icmp/icmp_main.c index abd4ca19b4e..afe0f3e576a 100644 --- a/reactos/dll/win32/icmp/icmp_main.c +++ b/reactos/dll/win32/icmp/icmp_main.c @@ -273,7 +273,7 @@ DWORD WINAPI IcmpSendEcho( if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - unsigned int len; + int len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); @@ -332,7 +332,7 @@ DWORD WINAPI IcmpSendEcho( #endif send_time = GetTickCount(); - res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); + res=sendto(icp->sid, (const char*)reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); HeapFree(GetProcessHeap (), 0, reqbuf); if (res<0) { if (WSAGetLastError()==WSAEMSGSIZE) @@ -357,7 +357,7 @@ DWORD WINAPI IcmpSendEcho( ip_header_len=0; /* because gcc was complaining */ while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,(int*)&addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild index e47321ffaa9..ecdc10c94e8 100644 --- a/reactos/dll/win32/inetcomm/inetcomm.rbuild +++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild @@ -1,7 +1,7 @@ - + . diff --git a/reactos/dll/win32/inetcomm/mimeintl.c b/reactos/dll/win32/inetcomm/mimeintl.c index 6d37147e2bf..e7cee39b692 100644 --- a/reactos/dll/win32/inetcomm/mimeintl.c +++ b/reactos/dll/win32/inetcomm/mimeintl.c @@ -119,7 +119,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, if(hCharset == NULL) return E_INVALIDARG; /* FIXME check hCharset is valid */ - InterlockedExchangePointer(&This->default_charset, hCharset); + (void)InterlockedExchangePointer(&This->default_charset, hCharset); return S_OK; } @@ -136,7 +136,7 @@ static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, HCHARSET hcs; hr = IMimeInternational_GetCodePageCharset(iface, GetACP(), CHARSET_BODY, &hcs); if(SUCCEEDED(hr)) - InterlockedCompareExchangePointer(&This->default_charset, hcs, NULL); + (void)InterlockedCompareExchangePointer(&This->default_charset, hcs, NULL); } *phCharset = This->default_charset; diff --git a/reactos/dll/win32/odbc32/odbc32.rbuild b/reactos/dll/win32/odbc32/odbc32.rbuild index 54179867702..917b24a1bdb 100644 --- a/reactos/dll/win32/odbc32/odbc32.rbuild +++ b/reactos/dll/win32/odbc32/odbc32.rbuild @@ -1,7 +1,7 @@ - + . include/reactos/wine diff --git a/reactos/dll/win32/odbc32/proxyodbc.c b/reactos/dll/win32/odbc32/proxyodbc.c index 39266b9093b..f92e9f4c488 100644 --- a/reactos/dll/win32/odbc32/proxyodbc.c +++ b/reactos/dll/win32/odbc32/proxyodbc.c @@ -39,6 +39,8 @@ #include "wine/debug.h" //#include "wine/library.h" +#undef TRACE_ON + #include "sql.h" #include "sqltypes.h" #include "sqlext.h" @@ -221,7 +223,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) static BOOL ODBC_LoadDriverManager(void) { const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); +#ifndef __REACTOS__ char error[256]; +#endif TRACE("\n"); @@ -269,8 +273,10 @@ static BOOL ODBC_LoadDriverManager(void) static BOOL ODBC_LoadDMFunctions(void) { +#ifndef __REACTOS__ int i; char error[256]; +#endif if (gProxyHandle.dmHandle == NULL) return FALSE; @@ -554,8 +560,8 @@ SQLRETURN WINAPI SQLConnect(SQLHDBC ConnectionHandle, CHECK_READY_AND_dmHandle(); - strcpy(gProxyHandle.ServerName, ServerName); - strcpy(gProxyHandle.UserName, UserName); + strcpy(gProxyHandle.ServerName, (const char*)ServerName); + strcpy(gProxyHandle.UserName, (const char*)UserName); assert(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func); ret=(gProxyHandle.functions[SQLAPI_INDEX_SQLCONNECT].func) @@ -606,9 +612,7 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, (EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description, BufferLength2, NameLength2); -#ifndef __REACTOS__ - if (TRACE_ON(odbc)) -#endif + if (WINE_TRACE_ON(odbc)) { TRACE("returns: %d \t", ret); if (*NameLength1 > 0) diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild index 69258a12700..9d0e3952484 100644 --- a/reactos/dll/win32/shdocvw/shdocvw.rbuild +++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild @@ -1,4 +1,4 @@ - + . diff --git a/reactos/dll/win32/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c index b1d83d4cce5..548caa173dd 100644 --- a/reactos/dll/win32/shdocvw/shdocvw_main.c +++ b/reactos/dll/win32/shdocvw/shdocvw_main.c @@ -69,7 +69,7 @@ static void SHDOCVW_guid2wstr( const GUID *guid, LPWSTR wstr ) { char str[40]; - sprintf(str, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h index f706ef96c8b..dabf09dcbaf 100644 --- a/reactos/include/psdk/winbase.h +++ b/reactos/include/psdk/winbase.h @@ -1090,7 +1090,13 @@ typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); #if (_WIN32_WINNT >= 0x0600) typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #endif + +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ +#define MAKEINTATOM(atom) ((ULONG_PTR)((WORD)(atom))) +#else #define MAKEINTATOM(i) (LPTSTR)((ULONG_PTR)((WORD)(i))) +#endif + /* Functions */ #ifndef UNDER_CE int APIENTRY WinMain(HINSTANCE,HINSTANCE,LPSTR,int);