Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [IPHLPAPI] icmp.c: Restore sync after Wine Staging 1.7.55

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f5f7a97f85de8e66c22b… commit 9f5f7a97f85de8e66c22b2e2eac7e687e27889c6 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Aug 20 06:36:16 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 15:20:01 2019 +0200 [IPHLPAPI] icmp.c: Restore sync after Wine Staging 1.7.55 Mark all our (new) differences. --- dll/win32/iphlpapi/icmp.c | 106 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 97 insertions(+), 9 deletions(-) diff --git a/dll/win32/iphlpapi/icmp.c b/dll/win32/iphlpapi/icmp.c index 2dcf4bbafc5..dec33c13ca9 100644 --- a/dll/win32/iphlpapi/icmp.c +++ b/dll/win32/iphlpapi/icmp.c @@ -32,7 +32,57 @@ * - Using the winsock functions has not been tested. */ +#ifdef __REACTOS__ #include "iphlpapi_private.h" +#else // ! __REACTOS__ +#include "config.h" +#include "wine/port.h" + +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +# include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif + +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +#include <stdarg.h> +#include <string.h> +#include <stdio.h> +#include <errno.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif + +#define USE_WS_PREFIX + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winternl.h" +#include "ipexport.h" +#include "icmpapi.h" +#include "wine/debug.h" +#endif // ! __REACTOS__ /* Set up endianness macros for the ip and ip_icmp BSD headers */ #ifndef BIG_ENDIAN @@ -114,8 +164,8 @@ static int in_cksum(u_short *addr, int len) HANDLE WINAPI Icmp6CreateFile(VOID) { icmp_t* icp; - int sid; #ifdef __REACTOS__ + int sid; WSADATA wsaData; if (WSAStartup(MAKEWORD(2, 2), &wsaData) != ERROR_SUCCESS) @@ -123,10 +173,11 @@ HANDLE WINAPI Icmp6CreateFile(VOID) ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); return INVALID_HANDLE_VALUE; } -#endif sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); -#ifndef __REACTOS__ +#else + + int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); if (sid < 0) { /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ @@ -191,8 +242,8 @@ HANDLE WINAPI IcmpCreateFile(VOID) static int once; #endif icmp_t* icp; - int sid; #ifdef __REACTOS__ + int sid; WSADATA wsaData; if (WSAStartup(MAKEWORD(2, 2), &wsaData) != ERROR_SUCCESS) @@ -200,15 +251,15 @@ HANDLE WINAPI IcmpCreateFile(VOID) ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); return INVALID_HANDLE_VALUE; } -#endif sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); -#ifdef __REACTOS__ if (sid < 0) { ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED); return INVALID_HANDLE_VALUE; } #else + + int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); if (sid < 0) { /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ @@ -243,8 +294,12 @@ HANDLE WINAPI IcmpCreateFile(VOID) BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) { icmp_t* icp=(icmp_t*)IcmpHandle; +#ifdef __REACTOS__ // REACTOS: Added a check for NULL handle, CORE-10707 if (IcmpHandle==INVALID_HANDLE_VALUE || IcmpHandle==NULL) { +#else + if (IcmpHandle==INVALID_HANDLE_VALUE) { +#endif /* FIXME: in fact win98 seems to ignore the handle value !!! */ SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -494,8 +549,7 @@ static DWORD system_icmp( return 0; #endif } -#endif - +#else // __REACTOS__ BOOL GetIPv4ByIndex( _In_ DWORD Index, @@ -529,6 +583,7 @@ GetIPv4ByIndex( HeapFree(GetProcessHeap(), 0, pIpAddrTable); return result; } +#endif // __REACTOS__ /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) @@ -572,6 +627,7 @@ DWORD WINAPI IcmpSendEcho( return 0; } +#ifdef __REACTOS__ if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -589,6 +645,10 @@ DWORD WINAPI IcmpSendEcho( if (Timeout == 0 || Timeout == -1) { SetLastError(ERROR_INVALID_PARAMETER); +#else + if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) { + SetLastError(IP_BUF_TOO_SMALL); +#endif return 0; } /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ @@ -614,9 +674,13 @@ DWORD WINAPI IcmpSendEcho( #endif seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; +#ifdef __REACTOS__ reqsize=ICMP_MINLEN; if (RequestData && RequestSize > 0) reqsize += RequestSize; +#else + reqsize=ICMP_MINLEN+RequestSize; +#endif reqbuf=HeapAlloc(GetProcessHeap(), 0, reqsize); if (reqbuf==NULL) { SetLastError(ERROR_OUTOFMEMORY); @@ -629,8 +693,12 @@ DWORD WINAPI IcmpSendEcho( icmp_header->icmp_cksum=0; icmp_header->icmp_id=id; icmp_header->icmp_seq=seq; +#ifdef __REACTOS__ if (RequestData && RequestSize > 0) memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize); +#else + memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize); +#endif icmp_header->icmp_cksum=cksum=in_cksum((u_short*)reqbuf,reqsize); addr.sin_family=AF_INET; @@ -686,8 +754,14 @@ DWORD WINAPI IcmpSendEcho( #endif addrlen=sizeof(addr); ier=ReplyBuffer; +#ifdef __REACTOS__ endbuf=((char *) ReplyBuffer)+ReplySize; maxlen=sizeof(struct ip)+ICMP_MINLEN+RequestSize; +#else + ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); + endbuf=(char *) ReplyBuffer+ReplySize; + maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); +#endif /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); @@ -710,6 +784,7 @@ DWORD WINAPI IcmpSendEcho( #endif HeapFree(GetProcessHeap (), 0, reqbuf); if (res<0) { +#ifdef __REACTOS__ DWORD dwBestIfIndex; IPAddr IP4Addr; @@ -721,7 +796,6 @@ DWORD WINAPI IcmpSendEcho( memcpy(&ier->Address, &IP4Addr, sizeof(IP4Addr)); } -#ifdef __REACTOS__ if (WSAGetLastError()==WSAEMSGSIZE) ier->Status = IP_PACKET_TOO_BIG; else { @@ -760,7 +834,9 @@ DWORD WINAPI IcmpSendEcho( } /* Get the reply */ +#ifdef __REACTOS__ ip_header=HeapAlloc(GetProcessHeap(), 0, maxlen); +#endif ip_header_len=0; /* because gcc was complaining */ #ifdef __REACTOS__ while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) { @@ -775,8 +851,10 @@ DWORD WINAPI IcmpSendEcho( #endif TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; +#ifdef __REACTOS__ if (res < 0) break; +#endif /* Check whether we should ignore this packet */ if ((ip_header->ip_p==IPPROTO_ICMP) && (res>=sizeof(struct ip)+ICMP_MINLEN)) { @@ -905,6 +983,10 @@ DWORD WINAPI IcmpSendEcho( /* Prepare for the next packet */ ier++; +#ifndef __REACTOS__ + ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); + maxlen=endbuf-(char*)ip_header; +#endif /* Check out whether there is more but don't wait this time */ #ifdef __REACTOS__ @@ -919,13 +1001,19 @@ DWORD WINAPI IcmpSendEcho( FD_SET(icp->sid,&fdr); #endif } +#ifdef __REACTOS__ HeapFree(GetProcessHeap(), 0, ip_header); +#endif res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) +#ifdef __REACTOS__ { ier->Status = IP_REQ_TIMED_OUT; +#endif SetLastError(IP_REQ_TIMED_OUT); +#ifdef __REACTOS__ } +#endif TRACE("received %d replies\n",res); return res; }

5 years, 4 months

[reactos] 06/06: [PSDK] Fix GCC8 complaining on duplicate and wrong declarations

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bda22774a74ab9fd24620… commit bda22774a74ab9fd246201de35ada73477b7d68f Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 23:08:22 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [PSDK] Fix GCC8 complaining on duplicate and wrong declarations --- sdk/include/psdk/cguid.h | 46 ++++++++++++++++++++++++------------------- sdk/include/psdk/docobj.idl | 2 +- sdk/include/psdk/mswsockdef.h | 4 ++-- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/sdk/include/psdk/cguid.h b/sdk/include/psdk/cguid.h index 3473851ac83..d8f06bd6c35 100644 --- a/sdk/include/psdk/cguid.h +++ b/sdk/include/psdk/cguid.h @@ -19,33 +19,39 @@ #ifndef __CGUID_H__ #define __CGUID_H__ +#if __GNUC__ >= 8 +#define GCC8DECLSPEC_SELECTANY DECLSPEC_SELECTANY +#else +#define GCC8DECLSPEC_SELECTANY +#endif + #ifdef __cplusplus extern "C" { #endif -extern const IID GUID_NULL; -extern const IID IID_IRpcChannel; -extern const IID IID_IRpcStub; -extern const IID IID_IStubManager; -extern const IID IID_IRpcProxy; -extern const IID IID_IProxyManager; -extern const IID IID_IPSFactory; -extern const IID IID_IInternalMoniker; -extern const IID IID_IDfReserved1; -extern const IID IID_IDfReserved2; -extern const IID IID_IDfReserved3; +extern const IID GCC8DECLSPEC_SELECTANY GUID_NULL; +extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcChannel; +extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcStub; +extern const IID GCC8DECLSPEC_SELECTANY IID_IStubManager; +extern const IID GCC8DECLSPEC_SELECTANY IID_IRpcProxy; +extern const IID GCC8DECLSPEC_SELECTANY IID_IProxyManager; +extern const IID GCC8DECLSPEC_SELECTANY IID_IPSFactory; +extern const IID GCC8DECLSPEC_SELECTANY IID_IInternalMoniker; +extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved1; +extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved2; +extern const IID GCC8DECLSPEC_SELECTANY IID_IDfReserved3; extern const CLSID CLSID_StdMarshal; extern const CLSID CLSID_AggStdMarshal; extern const CLSID CLSID_StdAsyncActManager; -extern const IID IID_IStub; -extern const IID IID_IProxy; -extern const IID IID_IEnumGeneric; -extern const IID IID_IEnumHolder; -extern const IID IID_IEnumCallback; -extern const IID IID_IOleManager; -extern const IID IID_IOlePresObj; -extern const IID IID_IDebug; -extern const IID IID_IDebugStream; +extern const IID GCC8DECLSPEC_SELECTANY IID_IStub; +extern const IID GCC8DECLSPEC_SELECTANY IID_IProxy; +extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumGeneric; +extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumHolder; +extern const IID GCC8DECLSPEC_SELECTANY IID_IEnumCallback; +extern const IID GCC8DECLSPEC_SELECTANY IID_IOleManager; +extern const IID GCC8DECLSPEC_SELECTANY IID_IOlePresObj; +extern const IID GCC8DECLSPEC_SELECTANY IID_IDebug; +extern const IID GCC8DECLSPEC_SELECTANY IID_IDebugStream; extern const CLSID CLSID_PSGenObject; extern const CLSID CLSID_PSClientSite; extern const CLSID CLSID_PSClassObject; diff --git a/sdk/include/psdk/docobj.idl b/sdk/include/psdk/docobj.idl index 119d4eab84e..e90c19023b1 100644 --- a/sdk/include/psdk/docobj.idl +++ b/sdk/include/psdk/docobj.idl @@ -419,4 +419,4 @@ cpp_quote("#define IID_IMsoView IID_IOleDocumentView") cpp_quote("#define IID_IEnumMsoView IID_IEnumOleDocumentViews") cpp_quote("#define IID_IMsoCommandTarget IID_IOleCommandTarget") -cpp_quote("EXTERN_C const GUID SID_SContainerDispatch;") +cpp_quote("DEFINE_GUID(SID_SContainerDispatch, 0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70);") diff --git a/sdk/include/psdk/mswsockdef.h b/sdk/include/psdk/mswsockdef.h index 6303cf46978..75d812c2029 100644 --- a/sdk/include/psdk/mswsockdef.h +++ b/sdk/include/psdk/mswsockdef.h @@ -21,7 +21,7 @@ extern "C" { #ifdef _WS2DEF_ -extern CONST UCHAR sockaddr_size[AF_MAX]; +const UCHAR sockaddr_size[AF_MAX]; MSWSOCKDEF_INLINE UCHAR @@ -53,7 +53,7 @@ typedef enum _WSA_COMPATIBILITY_BEHAVIOR_ID { typedef struct _WSA_COMPATIBILITY_MODE { WSA_COMPATIBILITY_BEHAVIOR_ID BehaviorId; ULONG TargetOsVersion; -} WSA_COMPATIBILITY_MODE, *PWSA_COMPATIBILITY_MODE; +} WSA_COMPATIBILITY_MODE, *PWSA_COMPATIBILITY_MODE; #endif /* (_WIN32_WINNT>=0x0600) */

5 years, 4 months

[reactos] 05/06: [APITESTS] Ignore GCC8 warnings where we test some crazy stuff

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c0a2a35e7f40f40d3827… commit 1c0a2a35e7f40f40d382730d4467cc03dc43a2d6 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 23:05:45 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [APITESTS] Ignore GCC8 warnings where we test some crazy stuff --- modules/rostests/apitests/atl/CAtlArray.cpp | 5 +++++ modules/rostests/apitests/crt/dll_startup.cpp | 5 +++++ modules/rostests/apitests/crt/sprintf.c | 5 ++++- modules/rostests/apitests/crt/static_construct.cpp | 6 +++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/atl/CAtlArray.cpp b/modules/rostests/apitests/atl/CAtlArray.cpp index 8d4bc70dda0..ef7828ed951 100644 --- a/modules/rostests/apitests/atl/CAtlArray.cpp +++ b/modules/rostests/apitests/atl/CAtlArray.cpp @@ -6,6 +6,11 @@ * Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) */ +#if defined(__GNUC__) && __GNUC__ >= 7 +// this is an intended behaviour +#pragma GCC diagnostic ignored "-Wclass-memaccess" +#endif + #ifdef HAVE_APITEST #include <apitest.h> #else diff --git a/modules/rostests/apitests/crt/dll_startup.cpp b/modules/rostests/apitests/crt/dll_startup.cpp index c6487fd6ac4..506b6599d74 100644 --- a/modules/rostests/apitests/crt/dll_startup.cpp +++ b/modules/rostests/apitests/crt/dll_startup.cpp @@ -8,6 +8,11 @@ #include <apitest.h> #include "dll_startup.h" +// we test the initial value of m_uninit variable here, so this is required +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wuninitialized" +#endif + static struct counter_values counter_values = { 0, 0, 0, 0, 5656, 0, 0 diff --git a/modules/rostests/apitests/crt/sprintf.c b/modules/rostests/apitests/crt/sprintf.c index 9a253e537f5..67945687797 100644 --- a/modules/rostests/apitests/crt/sprintf.c +++ b/modules/rostests/apitests/crt/sprintf.c @@ -16,10 +16,13 @@ #ifdef _MSC_VER #pragma warning(disable:4778) // unterminated format string '%' -#else +#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wformat" #pragma GCC diagnostic ignored "-Wformat-zero-length" #pragma GCC diagnostic ignored "-Wnonnull" +#if __GNUC__ >= 7 +#pragma GCC diagnostic ignored "-Wformat-overflow" +#endif #endif static diff --git a/modules/rostests/apitests/crt/static_construct.cpp b/modules/rostests/apitests/crt/static_construct.cpp index 3f8ff9ab25c..b26f2a1eabf 100644 --- a/modules/rostests/apitests/crt/static_construct.cpp +++ b/modules/rostests/apitests/crt/static_construct.cpp @@ -10,6 +10,10 @@ #include <strsafe.h> #include "dll_startup.h" +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wuninitialized" +#endif + extern "C" { extern int static_init_counter; @@ -221,7 +225,7 @@ START_TEST(static_construct) ok(g_CreatedFileMapping == FALSE, "Expected the shared memory to be created by my parent!\n"); return; } - + TestInitStatic(); TestDllStartup(); TestStaticDestruct();

5 years, 4 months

[reactos] 04/06: [APITESTS] Use StringCbPrintfA instead of sprintf And fix a buffer size in Test_AddFontResourceA

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b10706205025a03c56da… commit 6b10706205025a03c56da9d2f2997d324ed3c71a Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 23:04:41 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [APITESTS] Use StringCbPrintfA instead of sprintf And fix a buffer size in Test_AddFontResourceA --- modules/rostests/apitests/advapi32/IsTextUnicode.c | 4 ++-- modules/rostests/apitests/apphelp/layerapi.c | 5 ++-- modules/rostests/apitests/gdi32/AddFontResource.c | 4 ++-- .../apitests/kernel32/GetVolumeInformation.c | 6 ++--- .../apitests/ntdll/RtlDosPathNameToNtPathName_U.c | 7 +++--- .../rostests/apitests/ntdll/RtlGenerate8dot3Name.c | 4 ++-- .../apitests/setupapi/SetupDiInstallClassExA.c | 27 +++++++++++----------- .../SetupInstallServicesFromInfSectionEx.c | 11 +++++---- 8 files changed, 36 insertions(+), 32 deletions(-) diff --git a/modules/rostests/apitests/advapi32/IsTextUnicode.c b/modules/rostests/apitests/advapi32/IsTextUnicode.c index 9bd170cefb8..ba10640ec62 100644 --- a/modules/rostests/apitests/advapi32/IsTextUnicode.c +++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c @@ -18,9 +18,9 @@ PVOID LoadCodePageData(ULONG Code) GetSystemDirectoryA(sysdir, MAX_PATH); if (Code != -1) - sprintf(filename, "%s\\c_%lu.nls", sysdir, Code); + StringCbPrintfA(filename, sizeof(filename), "%s\\c_%lu.nls", sysdir, Code); else - sprintf(filename, "%s\\l_intl.nls", sysdir); + StringCbPrintfA(filename, sizeof(filename), "%s\\l_intl.nls", sysdir); hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile != INVALID_HANDLE_VALUE) diff --git a/modules/rostests/apitests/apphelp/layerapi.c b/modules/rostests/apitests/apphelp/layerapi.c index fd443989406..f06457c8c1f 100644 --- a/modules/rostests/apitests/apphelp/layerapi.c +++ b/modules/rostests/apitests/apphelp/layerapi.c @@ -17,6 +17,7 @@ #endif #include <winerror.h> #include <stdio.h> +#include <strsafe.h> #include "wine/test.h" #include "apitest_iathook.h" @@ -310,9 +311,9 @@ static void test_SdbGetPermLayerKeys(void) skip("Skipping tests for HKLM, cannot alter the registry\n"); } /* Fail from these paths */ - sprintf(tmp, "\\?\\%s", file); + StringCbPrintfA(tmp, sizeof(tmp), "\\?\\%s", file); expect_Sdb(tmp, GPLK_USER, FALSE, 0xffffffff, ""); - sprintf(tmp, "\\??\\%s", file); + StringCbPrintfA(tmp, sizeof(tmp), "\\??\\%s", file); expect_Sdb(tmp, GPLK_USER, FALSE, 0xffffffff, ""); ok(setLayerValue(FALSE, file, "!#!# RUNASADMIN RUNASADMIN !# WINXPSP3 "), "Expected setLayerValue not to fail\n"); diff --git a/modules/rostests/apitests/gdi32/AddFontResource.c b/modules/rostests/apitests/gdi32/AddFontResource.c index cee4079d97c..24c8433a73f 100644 --- a/modules/rostests/apitests/gdi32/AddFontResource.c +++ b/modules/rostests/apitests/gdi32/AddFontResource.c @@ -11,7 +11,7 @@ void Test_AddFontResourceA() { - CHAR szFileNameA[MAX_PATH]; + CHAR szFileNameA[MAX_PATH*2 + 3]; CHAR szFileNameFont1A[MAX_PATH]; CHAR szFileNameFont2A[MAX_PATH]; int result; @@ -24,7 +24,7 @@ void Test_AddFontResourceA() memcpy(szFileNameFont2A,szFileNameA,MAX_PATH ); strcat(szFileNameFont2A, "\\bin\\testdata\\test.otf"); - RtlZeroMemory(szFileNameA,MAX_PATH); + RtlZeroMemory(szFileNameA, sizeof(szFileNameA)); /* * Start testing Ansi version diff --git a/modules/rostests/apitests/kernel32/GetVolumeInformation.c b/modules/rostests/apitests/kernel32/GetVolumeInformation.c index 5184f1c9c3e..8bf96d6ad5e 100644 --- a/modules/rostests/apitests/kernel32/GetVolumeInformation.c +++ b/modules/rostests/apitests/kernel32/GetVolumeInformation.c @@ -73,7 +73,7 @@ TestGetVolumeInformationW(VOID) WCHAR Outbuf[MAX_PATH]; DWORD i, MCL, Flags, Len; - memset(Outbuf, 0xAA, MAX_PATH); + memset(Outbuf, 0xAA, sizeof(Outbuf)); Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, MAX_PATH); ok(Ret != FALSE, "GetVolumeInformationW failed: %ld\n", GetLastError()); for (i = 0; i < MAX_PATH; ++i) @@ -85,7 +85,7 @@ TestGetVolumeInformationW(VOID) } ok(i != MAX_PATH, "String was not null terminated!\n"); - memset(Outbuf, 0xAA, MAX_PATH); + memset(Outbuf, 0xAA, sizeof(Outbuf)); Len = i; Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len + 1); ok(Ret != FALSE, "GetVolumeInformationW failed: %ld\n", GetLastError()); @@ -99,7 +99,7 @@ TestGetVolumeInformationW(VOID) ok(i != MAX_PATH, "String was not null terminated!\n"); ok(i == Len, "String was truncated\n"); - memset(Outbuf, 0xAA, MAX_PATH); + memset(Outbuf, 0xAA, sizeof(Outbuf)); Len = i; SetLastError(0xdeadbeef); Ret = GetVolumeInformationW(L"C:\\", NULL, 0, NULL, &MCL, &Flags, Outbuf, Len); diff --git a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c index 59a15523c1b..9cbeefeceb3 100644 --- a/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c +++ b/modules/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c @@ -57,7 +57,7 @@ typedef struct UNICODE_STRING { USHORT Length; USHORT MaximumLength; PWSTR Buffer; -} UNICODE_STRING, *PUNICODE_STRING; +} UNICODE_STRING, *PUNICODE_STRING; typedef struct _RTLP_CURDIR_REF { @@ -207,7 +207,8 @@ typedef struct DirComponents char szCD[512]; char szCDPlusSlash[512]; char* pszLastCDComponent; - char szCurDrive[4]; + char szCurDrive[3]; + char reserved1; char szCurDriveSlash[4]; char szParentDir[512]; char szParentDirPlusSlash[512]; @@ -346,7 +347,7 @@ int main() #endif // PRINT_INFO DirComponents cd; - char szTmp[512]; + char szTmp[518]; #ifndef COMPILE_AS_ROSTEST InitFunctionPointer(); diff --git a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c index 8ea52d0975e..9b606526c9a 100644 --- a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c +++ b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c @@ -76,9 +76,9 @@ PVOID LoadCodePageData(ULONG Code) GetSystemDirectoryA(sysdir, MAX_PATH); if (Code != -1) - sprintf(filename, "%s\\c_%lu.nls", sysdir, Code); + StringCbPrintfA(filename, sizeof(filename), "%s\\c_%lu.nls", sysdir, Code); else - sprintf(filename, "%s\\l_intl.nls", sysdir); + StringCbPrintfA(filename, sizeof(filename), "%s\\l_intl.nls", sysdir); hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile != INVALID_HANDLE_VALUE) diff --git a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c index 34c0546ecc5..73bf2739373 100644 --- a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c +++ b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c @@ -25,6 +25,7 @@ #include <winreg.h> #include <winsvc.h> #include <setupapi.h> +#include <strsafe.h> static const char inffile[] = "test.inf"; static char CURR_DIR[MAX_PATH]; @@ -56,7 +57,7 @@ static void test_SetupDiInstallClassExA(void) /* [Version]:Signature */ strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -68,7 +69,7 @@ static void test_SetupDiInstallClassExA(void) /* [Version]:Signature+Class */ strcat(inf, "Class=MySampleClass\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -80,7 +81,7 @@ static void test_SetupDiInstallClassExA(void) /* [Version]:Signature+Class+ClassGUID */ strcat(inf, "ClassGuid={3b409830-5f9d-432a-abf5-7d2e4e102467}\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -92,7 +93,7 @@ static void test_SetupDiInstallClassExA(void) /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]Empty */ strcat(inf, "[ClassInstall32.NT]\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -104,13 +105,13 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success \n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg */ strcat(inf, "AddReg=SampleClassAddReg\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -122,13 +123,13 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success \n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg];*/ strcat(inf, "[SampleClassAddReg]\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -140,13 +141,13 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success \n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg]HKR;*/ strcat(inf, "HKR,,,,\"ReactOS Test SetupDiInstallClassExA\"\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -158,13 +159,13 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success \n"); } /*[Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg;[SampleClassAddReg]HKR;[ClassInstall32.NT.Services]*/ strcat(inf, "[ClassInstall32.NT.Services]\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); SetLastError(0xdeadbeef); ret = SetupDiInstallClassExA(NULL, path, DI_QUIETINSTALL, NULL, NULL, NULL,NULL); @@ -176,7 +177,7 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success\n"); + ok(del == ERROR_SUCCESS, "Expected success\n"); } /* Add a reference */ diff --git a/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c b/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c index 4e775c30281..20255faf291 100644 --- a/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c +++ b/modules/rostests/apitests/setupapi/SetupInstallServicesFromInfSectionEx.c @@ -25,6 +25,7 @@ #include <winreg.h> #include <winsvc.h> #include <setupapi.h> +#include <strsafe.h> static const char inffile[] = "test.inf"; static char CURR_DIR[MAX_PATH]; @@ -72,7 +73,7 @@ static void test_SetupInstallServicesFromInfSectionExA(void) /* Basic inf file to satisfy SetupOpenInfFileA */ strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); /* Nothing but the Version section */ @@ -193,7 +194,7 @@ static void test_SetupInstallServicesFromInfSectionExA(void) strcat(inf, "[XSP.InstallPerVer]\n"); strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); SetLastError(0xdeadbeef); @@ -227,7 +228,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void) /* Basic inf file to satisfy SetupOpenInfFileA */ strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); /* Nothing but the Version section */ @@ -348,7 +349,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void) strcat(inf, "[XSP.InstallPerVer]\n"); strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); + StringCbPrintfA(path, sizeof(path), "%s\\%s", CURR_DIR, inffile); infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); SetLastError(0xdeadbeef); @@ -364,7 +365,7 @@ static void test_SetupInstallServicesFromInfSectionExW(void) START_TEST(SetupInstallServicesFromInfSectionEx) { - char temp_path[MAX_PATH], prev_path[MAX_PATH]; + char temp_path[MAX_PATH], prev_path[MAX_PATH]; GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPathA(MAX_PATH, temp_path);

5 years, 4 months

[reactos] 03/06: [WINETESTS] Supress GCC8 warnings

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7dc14cca5208a75be516… commit f7dc14cca5208a75be5164fcad2906f206fe8c6d Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 22:56:40 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [WINETESTS] Supress GCC8 warnings --- modules/rostests/winetests/advpack/CMakeLists.txt | 4 ++++ modules/rostests/winetests/fusion/CMakeLists.txt | 4 ++++ modules/rostests/winetests/msi/CMakeLists.txt | 4 ++++ modules/rostests/winetests/msvcrt/CMakeLists.txt | 4 ++++ modules/rostests/winetests/msvcrt/heap.c | 12 +++++++++--- modules/rostests/winetests/services/CMakeLists.txt | 4 ++++ modules/rostests/winetests/setupapi/CMakeLists.txt | 4 ++++ modules/rostests/winetests/shell32/CMakeLists.txt | 4 ++++ modules/rostests/winetests/user32/CMakeLists.txt | 4 +++- modules/rostests/winetests/version/CMakeLists.txt | 4 ++++ modules/rostests/winetests/windowscodecs/CMakeLists.txt | 5 +++++ modules/rostests/winetests/winhttp/notification.c | 6 +++++- 12 files changed, 54 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/advpack/CMakeLists.txt b/modules/rostests/winetests/advpack/CMakeLists.txt index c6d489e0c8b..337bee72c24 100644 --- a/modules/rostests/winetests/advpack/CMakeLists.txt +++ b/modules/rostests/winetests/advpack/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DUSE_WINE_TODOS) +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + list(APPEND SOURCE advpack.c files.c diff --git a/modules/rostests/winetests/fusion/CMakeLists.txt b/modules/rostests/winetests/fusion/CMakeLists.txt index 0c908735377..fe6bc62c80a 100644 --- a/modules/rostests/winetests/fusion/CMakeLists.txt +++ b/modules/rostests/winetests/fusion/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DUSE_WINE_TODOS) +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + list(APPEND SOURCE asmcache.c asmenum.c diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 07729567c43..351bda2869f 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -8,6 +8,10 @@ if(MSVC_IDE) include_directories($<TARGET_FILE_DIR:custom>) endif() +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + spec2def(custom.dll custom.spec) add_library(custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) target_link_libraries(custom uuid) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 359fb2aa674..52585225f21 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -9,6 +9,10 @@ if(MSVC) add_compile_flags("/wd4477") endif() +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-stringop-truncation") +endif() + list(APPEND SOURCE cpp.c data.c diff --git a/modules/rostests/winetests/msvcrt/heap.c b/modules/rostests/winetests/msvcrt/heap.c index 4a3c7a81700..a0ce2a41628 100644 --- a/modules/rostests/winetests/msvcrt/heap.c +++ b/modules/rostests/winetests/msvcrt/heap.c @@ -23,6 +23,12 @@ #include <errno.h> #include "wine/test.h" +#ifdef __REACTOS__ +#if defined(__GNUC__) && __GNUC__ >= 7 +#pragma GCC diagnostic ignored "-Walloc-size-larger-than=9223372036854775807" +#endif +#endif + static void (__cdecl *p_aligned_free)(void*) = NULL; static void * (__cdecl *p_aligned_malloc)(size_t,size_t) = NULL; static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; @@ -489,13 +495,13 @@ START_TEST(heap) mem = realloc(NULL, 10); ok(mem != NULL, "memory not allocated\n"); - + mem = realloc(mem, 20); ok(mem != NULL, "memory not reallocated\n"); - + mem = realloc(mem, 0); ok(mem == NULL, "memory not freed\n"); - + mem = realloc(NULL, 0); ok(mem != NULL, "memory not (re)allocated for size 0\n"); diff --git a/modules/rostests/winetests/services/CMakeLists.txt b/modules/rostests/winetests/services/CMakeLists.txt index 7f04dcffec6..45eae4795f8 100644 --- a/modules/rostests/winetests/services/CMakeLists.txt +++ b/modules/rostests/winetests/services/CMakeLists.txt @@ -1,4 +1,8 @@ +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + add_executable(services_winetest service.c testlist.c) set_module_type(services_winetest win32cui) add_importlibs(services_winetest user32 advapi32 msvcrt kernel32) diff --git a/modules/rostests/winetests/setupapi/CMakeLists.txt b/modules/rostests/winetests/setupapi/CMakeLists.txt index 4f301cc08c6..e150b012597 100644 --- a/modules/rostests/winetests/setupapi/CMakeLists.txt +++ b/modules/rostests/winetests/setupapi/CMakeLists.txt @@ -1,4 +1,8 @@ +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + list(APPEND SOURCE devinst.c dialog.c diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index e459d95360e..429f1bf3323 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -3,6 +3,10 @@ add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + list(APPEND SOURCE appbar.c assoc.c diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 8c6f769c95f..bf635ae328b 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -5,6 +5,8 @@ add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x600) if(MSVC) # Disable warning C4477 (printf format warnings) add_compile_flags("/wd4477") +elseif(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") endif() list(APPEND SOURCE @@ -16,7 +18,7 @@ list(APPEND SOURCE dce.c dde.c dialog.c - edit.c + edit.c generated.c input.c listbox.c diff --git a/modules/rostests/winetests/version/CMakeLists.txt b/modules/rostests/winetests/version/CMakeLists.txt index 99a2fb5ebf6..c4c6f065895 100644 --- a/modules/rostests/winetests/version/CMakeLists.txt +++ b/modules/rostests/winetests/version/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DUSE_WINE_TODOS) +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-format-overflow") +endif() + list(APPEND SOURCE info.c install.c diff --git a/modules/rostests/winetests/windowscodecs/CMakeLists.txt b/modules/rostests/winetests/windowscodecs/CMakeLists.txt index 6bae33b8912..09cca9909aa 100644 --- a/modules/rostests/winetests/windowscodecs/CMakeLists.txt +++ b/modules/rostests/winetests/windowscodecs/CMakeLists.txt @@ -3,6 +3,11 @@ add_definitions( -DUSE_WINE_TODOS -DWINETEST_USE_DBGSTR_LONGLONG) +# to be removed after synching with newer Wine +if(GCC AND GCC_VERSION VERSION_GREATER 7) + add_compile_flags("-Wno-stringop-overflow") +endif() + list(APPEND SOURCE bitmap.c bmpformat.c diff --git a/modules/rostests/winetests/winhttp/notification.c b/modules/rostests/winetests/winhttp/notification.c index 2322eae0a7b..494d474df46 100644 --- a/modules/rostests/winetests/winhttp/notification.c +++ b/modules/rostests/winetests/winhttp/notification.c @@ -1044,8 +1044,12 @@ if (!winetest_interactive) skip("Skipping test_persistent_connection due to hang. See ROSTESTS-295.\n"); } else -#endif +{ test_persistent_connection( si.port ); +} +#else + test_persistent_connection( si.port ); +#endif /* send the basic request again to shutdown the server thread */ test_basic_request( si.port, NULL, quitW );

5 years, 4 months

[reactos] 02/06: [CMAKE] Define GCC and CLANG cmake variables

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e90b6bb1e937016c9e7b6… commit e90b6bb1e937016c9e7b66db62575caade66e9b4 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Aug 20 01:07:45 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [CMAKE] Define GCC and CLANG cmake variables --- sdk/cmake/config.cmake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 7b296996adc..d3f596f3168 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -36,6 +36,20 @@ else() "Whether to compile for debugging.") endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(GCC TRUE CACHE BOOL "The compiler is GCC") + set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") +elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(GCC FALSE CACHE BOOL "The compiler is GCC") + set(CLANG TRUE CACHE BOOL "The compiler is LLVM Clang") +elseif(MSVC) # aka CMAKE_C_COMPILER_ID STEQUAL "MSVC" + set(GCC FALSE CACHE BOOL "The compiler is GCC") + set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") + # MSVC variable is already set by cmake +else() + message("WARNING: the compiler has not been recognized") +endif() + if(MSVC AND (NOT USE_CLANG_CL)) set(KDBG FALSE CACHE BOOL "Whether to compile in the integrated kernel debugger.")

5 years, 4 months

[reactos] 01/06: [VIDEOPRT] Fix RtlCopyMemory sizeof usage Spotted by GCC8

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=09abc443b1de48b19f786… commit 09abc443b1de48b19f786e8eee498547b551ffc7 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sat Aug 17 22:15:04 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Aug 20 15:05:47 2019 +0200 [VIDEOPRT] Fix RtlCopyMemory sizeof usage Spotted by GCC8 --- win32ss/drivers/videoprt/int10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index 35452501421..f83ed0f3dd2 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -399,7 +399,7 @@ VideoPortInt10( } /* Copy arguments to other format */ - RtlCopyMemory(&Int10BiosArguments, BiosArguments, sizeof(BiosArguments)); + RtlCopyMemory(&Int10BiosArguments, BiosArguments, sizeof(*BiosArguments)); Int10BiosArguments.SegDs = 0; Int10BiosArguments.SegEs = 0; @@ -407,7 +407,7 @@ VideoPortInt10( Status = IntInt10CallBios(NULL, &Int10BiosArguments); /* Copy results back */ - RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(BiosArguments)); + RtlCopyMemory(BiosArguments, &Int10BiosArguments, sizeof(*BiosArguments)); return Status; }

5 years, 4 months

[reactos] 01/01: [WIN32SS] WindowSnap must not affect the taskbar

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4193b8d8ace0b84d0bf82… commit 4193b8d8ace0b84d0bf82c72bc9263a35ee414a8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Aug 20 12:07:56 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Aug 20 12:07:56 2019 +0200 [WIN32SS] WindowSnap must not affect the taskbar This fixes regression CORE-16289 where we could not longer move the taskbar at a different than default location, as WindowSnap would interfere. Many Thanks to the patches author Doug Lyons. Eventually the heuristic that we use here to identify the taskbar via used window-styles could be improved later. Theoretically possible that it bails out on some other windows. The regression was introduced by 0.4.12-dev-373-g 7e396787ed00a3939031447725f79697a41878e1 --- win32ss/user/ntuser/defwnd.c | 20 +++++++++++++++++++- win32ss/user/ntuser/nonclient.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index fc55c4acfba..7b07ec4b0ad 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -539,6 +539,9 @@ IntDefWindowProc( PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); LRESULT lResult = 0; USER_REFERENCE_ENTRY Ref; + BOOL IsTaskBar; + DWORD Style; + DWORD ExStyle; if (Msg > WM_USER) return 0; @@ -785,7 +788,22 @@ IntDefWindowProc( { HWND hwndTop = UserGetForegroundWindow(); PWND topWnd = UserGetWindowObject(hwndTop); - if (topWnd) + + /* Test for typical TaskBar ExStyle Values */ + ExStyle = (topWnd->ExStyle & WS_EX_TOOLWINDOW); + TRACE("ExStyle is '%x'.\n", ExStyle); + + /* Test for typical TaskBar Style Values */ + Style = (topWnd->style & (WS_POPUP | WS_VISIBLE | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); + TRACE("Style is '%x'.\n", Style); + + /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ + IsTaskBar = (Style == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) + && (ExStyle == WS_EX_TOOLWINDOW); + TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + + if (topWnd && !IsTaskBar) /* Second test is so we are not touching the Taskbar */ { if ((topWnd->style & WS_THICKFRAME) == 0) { diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index ba8dececb13..0c7dac84c48 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -256,6 +256,8 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) //PMONITOR mon = 0; Don't port sync from wine!!! This breaks explorer task bar sizing!! // The task bar can grow in size and can not reduce due to the change // in the work area. + DWORD ExStyleTB, StyleTB; + BOOL IsTaskBar; Style = pwnd->style; ExStyle = pwnd->ExStyle; @@ -394,6 +396,20 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) /* Exit on button-up */ if (msg.message == WM_LBUTTONUP) { + /* Test for typical TaskBar ExStyle Values */ + ExStyleTB = (ExStyle & WS_EX_TOOLWINDOW); + TRACE("ExStyle is '%x'.\n", ExStyleTB); + + /* Test for typical TaskBar Style Values */ + StyleTB = (Style & (WS_POPUP | WS_VISIBLE | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN)); + TRACE("Style is '%x'.\n", StyleTB); + + /* Test for masked typical TaskBar Style and ExStyles to detect TaskBar */ + IsTaskBar = (StyleTB == (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN)) + && (ExStyleTB == WS_EX_TOOLWINDOW); + TRACE("This %s the TaskBar.\n", IsTaskBar ? "is" : "is not"); + // check for snapping if was moved by caption if (hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0) { @@ -401,6 +417,11 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam) BOOL doSideSnap = FALSE; UserSystemParametersInfo(SPI_GETWORKAREA, 0, &snapRect, 0); + /* if this is the taskbar, then we want to just exit */ + if (IsTaskBar) + { + break; + } // snap to left if (pt.x <= snapRect.left) {

5 years, 4 months

[reactos] 01/01: [NTOS:INBV] Refactor boot screen code and resources (#1649)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=238ea69ca0cc1c01332ea… commit 238ea69ca0cc1c01332ea9f6211bb2ce3ffb371a Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Tue Aug 20 02:52:25 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Aug 20 01:52:25 2019 +0200 [NTOS:INBV] Refactor boot screen code and resources (#1649) * [NTOS:INBV] Move typedefs to the only single file where they are used. * [NTOS:INBV] Refactor code & resources Remove garbage * [NTOS:INBV] Reduce fade time and remove wait for animation. --- ntoskrnl/inbv/inbv.c | 69 +++++++++++++++------ ntoskrnl/inbv/logo/1.bmp | Bin 20498 -> 0 bytes ntoskrnl/inbv/logo/5.bmp | Bin 16678 -> 0 bytes .../inbv/{logo/4.bmp => resources/barserver.bmp} | Bin .../inbv/{logo/8.bmp => resources/barwksta.bmp} | Bin ntoskrnl/inbv/resources/copyright.bmp | Bin 0 -> 1712 bytes .../inbv/{logo/15.bmp => resources/fserver.bmp} | Bin ntoskrnl/inbv/{logo/7.bmp => resources/fwksta.bmp} | Bin .../inbv/{logo/2.bmp => resources/hibernate.bmp} | Bin .../inbv/{logo/14.bmp => resources/hserver.bmp} | Bin ntoskrnl/inbv/{logo/6.bmp => resources/hwksta.bmp} | Bin ntoskrnl/inbv/{logo => resources}/line.bmp | Bin ntoskrnl/inbv/resources/line_pal.bmp | Bin 0 -> 322 bytes ntoskrnl/inbv/resources/logo.bmp | Bin 0 -> 16518 bytes ntoskrnl/inbv/resources/progress.bmp | Bin 0 -> 358 bytes .../inbv/{logo/3.bmp => resources/shutdown.bmp} | Bin ntoskrnl/include/internal/inbv.h | 21 ------- ntoskrnl/include/resource.h | 4 +- ntoskrnl/ntoskrnl.rc | 25 ++++---- 19 files changed, 67 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 5e96c978c2b..f5cd5652493 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -32,6 +32,27 @@ */ // #define REACTOS_SKUS +typedef struct _INBV_PROGRESS_STATE +{ + ULONG Floor; + ULONG Ceiling; + ULONG Bias; +} INBV_PROGRESS_STATE; + +typedef struct _BT_PROGRESS_INDICATOR +{ + ULONG Count; + ULONG Expected; + ULONG Percentage; +} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; + +typedef enum _ROT_BAR_TYPE +{ + RB_UNSPECIFIED, + RB_SQUARE_CELLS, + RB_PROGRESS_BAR +} ROT_BAR_TYPE; + /* * Screen resolution (for default VGA) */ @@ -155,8 +176,8 @@ typedef struct tagRGBQUAD static RGBQUAD MainPalette[16]; -#define PALETTE_FADE_STEPS 15 -#define PALETTE_FADE_TIME (20 * 1000) /* 20 ms */ +#define PALETTE_FADE_STEPS 12 +#define PALETTE_FADE_TIME (15 * 1000) /* 15 ms */ /** From bootvid/precomp.h **/ // @@ -1062,7 +1083,7 @@ VOID NTAPI DisplayBootBitmap(IN BOOLEAN TextMode) { - PVOID Header = NULL, Footer = NULL, Screen = NULL; + PVOID BootCopy = NULL, BootProgress = NULL, BootLogo = NULL, Header = NULL, Footer = NULL; #ifdef INBV_ROTBAR_IMPLEMENTED UCHAR Buffer[24 * 9]; @@ -1155,8 +1176,8 @@ DisplayBootBitmap(IN BOOLEAN TextMode) */ MmChangeKernelResourceSectionProtection(MM_READWRITE); - /* Load the standard boot screen */ - Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN); + /* Load boot screen logo */ + BootLogo = InbvGetResourceAddress(IDB_LOGO_DEFAULT); #ifdef REACTOS_SKUS Text = NULL; @@ -1197,15 +1218,19 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif /* Make sure we have a logo */ - if (Screen) + if (BootLogo) { /* Save the main image palette for implementing the fade-in effect */ - PBITMAPINFOHEADER BitmapInfoHeader = Screen; - LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); + PBITMAPINFOHEADER BitmapInfoHeader = BootLogo; + LPRGBQUAD Palette = (LPRGBQUAD)((PUCHAR)BootLogo + BitmapInfoHeader->biSize); RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); - /* Blit the background */ - BitBltPalette(Screen, TRUE, 0, 0); + /* Draw the logo at the center of the screen */ + BitBltAligned(BootLogo, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 0, 0, 34); #ifdef INBV_ROTBAR_IMPLEMENTED /* Choose progress bar */ @@ -1230,6 +1255,22 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif } + /* Load and draw progress bar bitmap */ + BootProgress = InbvGetResourceAddress(IDB_PROGRESS_BAR); + BitBltAligned(BootProgress, + TRUE, + AL_HORIZONTAL_CENTER, + AL_VERTICAL_CENTER, + 0, 118, 0, 0); + + /* Load and draw copyright text bitmap */ + BootCopy = InbvGetResourceAddress(IDB_COPYRIGHT); + BitBltAligned(BootCopy, + TRUE, + AL_HORIZONTAL_LEFT, + AL_VERTICAL_BOTTOM, + 22, 0, 0, 20); + #ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ if (Text) BitBltPalette(Text, TRUE, 180, 121); @@ -1309,14 +1350,6 @@ DisplayBootBitmap(IN BOOLEAN TextMode) RotBarSelection = TempRotBarSelection; InbvRotBarInit(); InbvReleaseLock(); - - // FIXME: This was added to allow animation start before the processor hangs - if (TempRotBarSelection != RB_UNSPECIFIED) - { - LARGE_INTEGER Delay; - Delay.QuadPart = -3000000; // 300 ms - KeDelayExecutionThread(KernelMode, FALSE, &Delay); - } } #endif } diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp deleted file mode 100644 index dcc0ae71a55..00000000000 Binary files a/ntoskrnl/inbv/logo/1.bmp and /dev/null differ diff --git a/ntoskrnl/inbv/logo/5.bmp b/ntoskrnl/inbv/logo/5.bmp deleted file mode 100644 index 94fb7a9dfde..00000000000 Binary files a/ntoskrnl/inbv/logo/5.bmp and /dev/null differ diff --git a/ntoskrnl/inbv/logo/4.bmp b/ntoskrnl/inbv/resources/barserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/4.bmp rename to ntoskrnl/inbv/resources/barserver.bmp diff --git a/ntoskrnl/inbv/logo/8.bmp b/ntoskrnl/inbv/resources/barwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/8.bmp rename to ntoskrnl/inbv/resources/barwksta.bmp diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp new file mode 100644 index 00000000000..080e462c659 Binary files /dev/null and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/ntoskrnl/inbv/logo/15.bmp b/ntoskrnl/inbv/resources/fserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/15.bmp rename to ntoskrnl/inbv/resources/fserver.bmp diff --git a/ntoskrnl/inbv/logo/7.bmp b/ntoskrnl/inbv/resources/fwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/7.bmp rename to ntoskrnl/inbv/resources/fwksta.bmp diff --git a/ntoskrnl/inbv/logo/2.bmp b/ntoskrnl/inbv/resources/hibernate.bmp similarity index 100% rename from ntoskrnl/inbv/logo/2.bmp rename to ntoskrnl/inbv/resources/hibernate.bmp diff --git a/ntoskrnl/inbv/logo/14.bmp b/ntoskrnl/inbv/resources/hserver.bmp similarity index 100% rename from ntoskrnl/inbv/logo/14.bmp rename to ntoskrnl/inbv/resources/hserver.bmp diff --git a/ntoskrnl/inbv/logo/6.bmp b/ntoskrnl/inbv/resources/hwksta.bmp similarity index 100% rename from ntoskrnl/inbv/logo/6.bmp rename to ntoskrnl/inbv/resources/hwksta.bmp diff --git a/ntoskrnl/inbv/logo/line.bmp b/ntoskrnl/inbv/resources/line.bmp similarity index 100% rename from ntoskrnl/inbv/logo/line.bmp rename to ntoskrnl/inbv/resources/line.bmp diff --git a/ntoskrnl/inbv/resources/line_pal.bmp b/ntoskrnl/inbv/resources/line_pal.bmp new file mode 100644 index 00000000000..5209c246efb Binary files /dev/null and b/ntoskrnl/inbv/resources/line_pal.bmp differ diff --git a/ntoskrnl/inbv/resources/logo.bmp b/ntoskrnl/inbv/resources/logo.bmp new file mode 100644 index 00000000000..53ec10c20c4 Binary files /dev/null and b/ntoskrnl/inbv/resources/logo.bmp differ diff --git a/ntoskrnl/inbv/resources/progress.bmp b/ntoskrnl/inbv/resources/progress.bmp new file mode 100644 index 00000000000..35fd2066714 Binary files /dev/null and b/ntoskrnl/inbv/resources/progress.bmp differ diff --git a/ntoskrnl/inbv/logo/3.bmp b/ntoskrnl/inbv/resources/shutdown.bmp similarity index 100% rename from ntoskrnl/inbv/logo/3.bmp rename to ntoskrnl/inbv/resources/shutdown.bmp diff --git a/ntoskrnl/include/internal/inbv.h b/ntoskrnl/include/internal/inbv.h index 3fb6669a584..4f9903e2501 100644 --- a/ntoskrnl/include/internal/inbv.h +++ b/ntoskrnl/include/internal/inbv.h @@ -1,26 +1,5 @@ #pragma once -typedef struct _INBV_PROGRESS_STATE -{ - ULONG Floor; - ULONG Ceiling; - ULONG Bias; -} INBV_PROGRESS_STATE; - -typedef struct _BT_PROGRESS_INDICATOR -{ - ULONG Count; - ULONG Expected; - ULONG Percentage; -} BT_PROGRESS_INDICATOR, *PBT_PROGRESS_INDICATOR; - -typedef enum _ROT_BAR_TYPE -{ - RB_UNSPECIFIED, - RB_SQUARE_CELLS, - RB_PROGRESS_BAR -} ROT_BAR_TYPE; - INIT_FUNCTION VOID NTAPI diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index bb400bb3151..e2537b465f5 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -40,5 +40,7 @@ /* ReactOS additions */ #define IDB_ROTATING_LINE 19 +#define IDB_PROGRESS_BAR 20 +#define IDB_COPYRIGHT 21 -#define IDB_MAX_RESOURCE IDB_ROTATING_LINE +#define IDB_MAX_RESOURCE IDB_COPYRIGHT diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 0a01fe32228..8f1888516ec 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -28,17 +28,18 @@ #include <bugcodes.rc> -IDB_BOOT_SCREEN BITMAP "inbv/logo/1.bmp" -IDB_HIBERNATE_BAR BITMAP "inbv/logo/2.bmp" -IDB_SHUTDOWN_MSG BITMAP "inbv/logo/3.bmp" -IDB_BAR_DEFAULT BITMAP "inbv/logo/4.bmp" -IDB_LOGO_DEFAULT BITMAP "inbv/logo/5.bmp" -IDB_WKSTA_HEADER BITMAP "inbv/logo/6.bmp" -IDB_WKSTA_FOOTER BITMAP "inbv/logo/7.bmp" -IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" -IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" +IDB_HIBERNATE_BAR BITMAP "inbv/resources/hibernate.bmp" +IDB_SHUTDOWN_MSG BITMAP "inbv/resources/shutdown.bmp" +IDB_BAR_DEFAULT BITMAP "inbv/resources/barserver.bmp" +IDB_LOGO_DEFAULT BITMAP "inbv/resources/logo.bmp" +IDB_WKSTA_HEADER BITMAP "inbv/resources/hwksta.bmp" +IDB_WKSTA_FOOTER BITMAP "inbv/resources/fwksta.bmp" +IDB_BAR_WKSTA BITMAP "inbv/resources/barwksta.bmp" +IDB_SERVER_LOGO BITMAP "inbv/resources/logo.bmp" +IDB_SERVER_HEADER BITMAP "inbv/resources/hserver.bmp" +IDB_SERVER_FOOTER BITMAP "inbv/resources/fserver.bmp" /* ReactOS additions */ -IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp" +IDB_ROTATING_LINE BITMAP "inbv/resources/line.bmp" +IDB_PROGRESS_BAR BITMAP "inbv/resources/progress.bmp" +IDB_COPYRIGHT BITMAP "inbv/resources/copyright.bmp"

5 years, 4 months

[reactos] 01/01: [HAL] Refactor PCI blacklisting for Xbox

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b99272702c94f5c6707dc… commit b99272702c94f5c6707dc095d3d11bb5a0147c43 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Aug 20 00:48:49 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 01:51:16 2019 +0200 [HAL] Refactor PCI blacklisting for Xbox - Use a separate function for detecting blacklisted PCI slots - Blacklist PCI-to-PCI bridge to avoid stack overflow on real hardware Microsoft Xbox 1.3 CORE-16319 CORE-16216 --- hal/halx86/legacy/bus/pcibus.c | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index a0aff2c70da..ab7ed855cdc 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -311,6 +311,36 @@ HalpWritePCIConfig(IN PBUS_HANDLER BusHandler, } } +#ifdef SARCH_XBOX +BOOLEAN +NTAPI +HalpXboxBlacklistedPCISlot(IN PBUS_HANDLER BusHandler, + IN PCI_SLOT_NUMBER Slot) +{ + /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely + * hang the Xbox. Also, the device number doesn't seem to be decoded for the + * video card, so it appears to be present on 1:0:0 - 1:31:0. + * We hack around these problems by indicating "device not present" for devices + * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + { + DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + return TRUE; + } + + /* Temporary hack to avoid stack overflow in kernel, see CORE-16319 */ + if (BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 8 && Slot.u.bits.FunctionNumber == 0) + { + DPRINT("Blacklisted PCI-to-PCI bridge (00:08.0 - PCI\\VEN_10DE&DEV_01B8, see CORE-16319)\n"); + return TRUE; + } + + return FALSE; +} +#endif + BOOLEAN NTAPI HalpValidPCISlot(IN PBUS_HANDLER BusHandler, @@ -326,18 +356,7 @@ HalpValidPCISlot(IN PBUS_HANDLER BusHandler, if (Slot.u.bits.DeviceNumber >= BusData->MaxDevice) return FALSE; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) - { - DPRINT("HalpValidPCISlot(): Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); - return FALSE; - } + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return FALSE; #endif /* Function 0 doesn't need checking */ @@ -378,16 +397,8 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) { - DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); if (Offset == 0 && Length >= sizeof(USHORT)) { *(PUSHORT)Buffer = PCI_INVALID_VENDORID; @@ -470,18 +481,7 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX - /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely - * hang the Xbox. Also, the device number doesn't seem to be decoded for the - * video card, so it appears to be present on 1:0:0 - 1:31:0. - * We hack around these problems by indicating "device not present" for devices - * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && - (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || - (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) - { - DPRINT1("Trying to set data on blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); - return 0; - } + if (HalpXboxBlacklistedPCISlot(BusHandler, Slot)) return 0; #endif /* Normalize the length */

5 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019