Ros-diffs

ros-diffs@reactos.org

81390 discussions

[lsuggs] 43894: libbind9, libdns, libisc, libisccfg and liblwres all compile and link. They are successfully making it into bootcd as well. All have been tested on Windows with a compiled ISC nslookup and work. Next is nslookup. Happy Halloween!
by lsuggs＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: lsuggs Date: Sun Nov 1 06:44:49 2009 New Revision: 43894 URL: http://svn.reactos.org/svn/reactos?rev=43894&view=rev Log: libbind9, libdns, libisc, libisccfg and liblwres all compile and link. They are successfully making it into bootcd as well. All have been tested on Windows with a compiled ISC nslookup and work. Next is nslookup. Happy Halloween! Modified: branches/nslookup/boot/bootdata/packages/reactos.dff branches/nslookup/dll/3rdparty/3rdparty.rbuild branches/nslookup/dll/3rdparty/bind9/bind9.rbuild branches/nslookup/dll/3rdparty/dns/dns.rbuild branches/nslookup/dll/3rdparty/dns/win32/libdns.def branches/nslookup/dll/3rdparty/isc/win32/libisc.def branches/nslookup/dll/3rdparty/isc/win32/win32os.c branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild branches/nslookup/dll/3rdparty/lwres/lwres.rbuild branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h Modified: branches/nslookup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/nslookup/boot/bootdata/packages… ============================================================================== --- branches/nslookup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/nslookup/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -129,6 +129,11 @@ dll\3rdparty\libjpeg\libjpeg.dll 1 dll\3rdparty\libxslt\libxslt.dll 1 dll\3rdparty\dxtn\dxtn.dll 1 optional +dll\3rdparty\isc\libisc.dll 1 +dll\3rdparty\dns\libdns.dll 1 +dll\3rdparty\isccfg\libisccfg.dll 1 +dll\3rdparty\lwres\liblwres.dll 1 +dll\3rdparty\bind9\libbind9.dll 1 dll\cpl\access\access.cpl 1 dll\cpl\appwiz\appwiz.cpl 1 Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.… ============================================================================== --- branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -3,6 +3,18 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="isc"> <xi:include href="isc/isc.rbuild" /> + </directory> + <directory name="dns"> + <xi:include href="dns/dns.rbuild" /> + </directory> + <directory name="isccfg"> + <xi:include href="isccfg/isccfg.rbuild" /> + </directory> + <directory name="lwres"> + <xi:include href="lwres/lwres.rbuild" /> + </directory> + <directory name="bind9"> + <xi:include href="bind9/bind9.rbuild" /> </directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> Modified: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/bind9/bin… ============================================================================== --- branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,8 +14,13 @@ <define name="LIBBIND9_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>dns</library> + <library>isccfg</library> + <library>ws2_32</library> <file>check.c</file> <file>getaddresses.c</file> + <importlibrary definition="win32/libbind9.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/dns/dns.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r… ============================================================================== --- branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -12,6 +12,15 @@ <define name="LIBDNS_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>uuid</library> + <library>ws2_32</library> + <library>msvcrt40</library> + <library>isc</library> + <importlibrary definition="win32/libdns.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/dns/win32/libdns.def URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/dns/win32/libdns.def [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/dns/win32/libdns.def [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -553,6 +553,7 @@ dns_result_register dns_result_torcode dns_result_totext +dns_rootname dns_rootns_create dns_sdb_putnamedrr dns_sdb_putrdata @@ -600,6 +601,12 @@ dns_tkey_processquery dns_tkeyctx_create dns_tkeyctx_destroy +dns_tsig_hmacmd5_name +dns_tsig_hmacsha1_name +dns_tsig_hmacsha224_name +dns_tsig_hmacsha256_name +dns_tsig_hmacsha384_name +dns_tsig_hmacsha512_name dns_tsig_sign dns_tsig_verify dns_tsigkey_attach Modified: branches/nslookup/dll/3rdparty/isc/win32/libisc.def URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/libisc.def [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/libisc.def [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -541,6 +541,7 @@ EXPORTS isc_assertion_failed DATA +isc_categories DATA isc_commandline_argument DATA isc_commandline_errprint DATA isc_commandline_index DATA Modified: branches/nslookup/dll/3rdparty/isc/win32/win32os.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/win32os.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/win32os.c [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -98,4 +98,4 @@ /* Exact */ return (0); -} +} Modified: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isccfg/is… ============================================================================== --- branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,11 +14,13 @@ <define name="USE_MD5" /> <define name="LIBISCCFG_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> - <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>dns</library> <file>aclconf.c</file> <file>log.c</file> <file>namedconf.c</file> <file>parser.c</file> + <importlibrary definition="win32/libisccfg.def" /> <directory name="win32"> <file>DLLMain.c</file> <file>version.c</file> Modified: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/lwr… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -14,6 +14,11 @@ <define name="LIBLWRES_EXPORTS" /> <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> <define name="ISC_PLATFORM_USEGCCASM" /> + <library>isc</library> + <library>ws2_32</library> + <library>msvcrt40</library> + <library>advapi32</library> + <library>iphlpapi</library> <file>context.c</file> <file>gai_strerror.c</file> <file>getaddrinfo.c</file> @@ -32,6 +37,7 @@ <file>lwres_grbn.c</file> <file>lwres_noop.c</file> <file>lwresutil.c</file> + <importlibrary definition="win32/liblwres.def" /> <directory name="win32"> <file>lwconfig.c</file> <file>DLLMain.c</file> Modified: branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/win… ============================================================================== --- branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] Sun Nov 1 06:44:49 2009 @@ -31,9 +31,7 @@ /* * Define if <netdb.h> does not declare struct addrinfo. */ -#ifndef __REACTOS__ #define ISC_LWRES_NEEDADDRINFO 1 -#endif #ifdef ISC_LWRES_NEEDADDRINFO struct addrinfo {

1 0

[lsuggs] 43893: Oops, forgot this one.
by lsuggs＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: lsuggs Date: Sun Nov 1 04:32:03 2009 New Revision: 43893 URL: http://svn.reactos.org/svn/reactos?rev=43893&view=rev Log: Oops, forgot this one. Modified: branches/nslookup/include/psdk/mswsock.h Modified: branches/nslookup/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/include/psdk/mswsock.h… ============================================================================== --- branches/nslookup/include/psdk/mswsock.h [iso-8859-1] (original) +++ branches/nslookup/include/psdk/mswsock.h [iso-8859-1] Sun Nov 1 04:32:03 2009 @@ -30,6 +30,7 @@ #define SO_MAXDG 0x7009 #define SO_MAXPATHDG 0x700A #define SO_UPDATE_ACCEPT_CONTEXT 0x700B +#define SO_UPDATE_CONNECT_CONTEXT 0x7010 #define SO_CONNECT_TIME 0x700C #define TCP_BSDURGENT 0x7000 @@ -55,10 +56,12 @@ #define WSAID_ACCEPTEX { 0xB5367DF0, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } #define WSAID_TRANSMITFILE { 0xB5367DF1, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } #define WSAID_GETACCEPTEXSOCKADDRS { 0xB5367DF2, 0xCBAC, 0x11CF, { 0x95, 0xCA, 0x00, 0x80, 0x5F, 0x48, 0xA1, 0x92 } } +#define WSAID_CONNECTEX { 0x25A207B9, 0xDDF3, 0x4660, { 0x8E, 0xE9, 0x76, 0xE5, 0x8C, 0x74, 0x06, 0x3E } } typedef BOOL (PASCAL *LPFN_TRANSMITFILE)(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_BUFFERS,DWORD); typedef BOOL (PASCAL *LPFN_ACCEPTEX)(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED); typedef VOID (PASCAL *LPFN_GETACCEPTEXSOCKADDRS)(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT); +typedef BOOL (PASCAL *LPFN_CONNECTEX)(SOCKET,const struct sockaddr FAR*,int,PVOID,DWORD,LPDWORD,LPOVERLAPPED ); #ifdef _WINSOCK2_H /* These require the winsock2 interface. */

1 0

[ahill] 43892: [browseui] - The global class instance _AtlComModule needs to be constructed with placement new also
by ahill＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: ahill Date: Sun Nov 1 03:26:24 2009 New Revision: 43892 URL: http://svn.reactos.org/svn/reactos?rev=43892&view=rev Log: [browseui] - The global class instance _AtlComModule needs to be constructed with placement new also Modified: trunk/reactos/dll/win32/browseui/browseui.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Nov 1 03:26:24 2009 @@ -77,6 +77,7 @@ new (&gModule) CBrowseUIModule; new (&gWinModule) CAtlWinModule; new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; if (dwReason == DLL_PROCESS_ATTACH) {

1 0

[lsuggs] 43891: libisc will now compile and link
by lsuggs＠svn.reactos.org 01 Nov '09

01 Nov '09

Author: lsuggs Date: Sun Nov 1 03:17:33 2009 New Revision: 43891 URL: http://svn.reactos.org/svn/reactos?rev=43891&view=rev Log: libisc will now compile and link Modified: branches/nslookup/dll/3rdparty/isc/include/config.h branches/nslookup/dll/3rdparty/isc/isc.rbuild branches/nslookup/dll/3rdparty/isc/sha2.c branches/nslookup/dll/3rdparty/isc/win32/condition.c branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h branches/nslookup/dll/3rdparty/isc/win32/socket.c Modified: branches/nslookup/dll/3rdparty/isc/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -195,8 +195,10 @@ #define getcwd _getcwd #endif +#ifndef __REACTOS__ #define utime _utime #define utimbuf _utimbuf +#endif /* #define EAFNOSUPPORT EINVAL */ #ifndef __REACTOS__ Modified: branches/nslookup/dll/3rdparty/isc/isc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="isc" type="win32dll" installbase="system32" installname="libisc.dll" allowwarnings="true"> + <include base="ReactOS">dll/3rdparty/isc</include> <include base="ReactOS">dll/3rdparty/isc/include</include> <include base="ReactOS">dll/3rdparty/isc/win32</include> <include base="ReactOS">dll/3rdparty/isc/win32/include</include> @@ -8,6 +9,14 @@ <include base="ReactOS">dll/3rdparty/isccfg/include</include> <define name="WIN32" /> <define name="LIBISC_EXPORTS" /> + <define name="ISC_PLATFORM_HAVEIN6PKTINFO" /> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>uuid</library> + <library>ws2_32</library> + <library>msvcrt40</library> <file>assertions.c</file> <file>base32.c</file> <file>base64.c</file> @@ -17,7 +26,6 @@ <file>commandline.c</file> <file>error.c</file> <file>event.c</file> - <file>fsaccess.c</file> <file>hash.c</file> <file>heap.c</file> <file>hex.c</file> @@ -59,6 +67,7 @@ <file>task.c</file> <file>taskpool.c</file> <file>timer.c</file> + <importlibrary definition="win32/libisc.def" /> <directory name="nls"> <file>msgcat.c</file> </directory> Modified: branches/nslookup/dll/3rdparty/isc/sha2.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/sha2.… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/sha2.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/sha2.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -259,70 +259,70 @@ #ifdef WIN32 /* Hash constant words K for SHA-384 and SHA-512: */ static const isc_uint64_t K512[80] = { - 0x428a2f98d728ae22UL, 0x7137449123ef65cdUL, - 0xb5c0fbcfec4d3b2fUL, 0xe9b5dba58189dbbcUL, - 0x3956c25bf348b538UL, 0x59f111f1b605d019UL, - 0x923f82a4af194f9bUL, 0xab1c5ed5da6d8118UL, - 0xd807aa98a3030242UL, 0x12835b0145706fbeUL, - 0x243185be4ee4b28cUL, 0x550c7dc3d5ffb4e2UL, - 0x72be5d74f27b896fUL, 0x80deb1fe3b1696b1UL, - 0x9bdc06a725c71235UL, 0xc19bf174cf692694UL, - 0xe49b69c19ef14ad2UL, 0xefbe4786384f25e3UL, - 0x0fc19dc68b8cd5b5UL, 0x240ca1cc77ac9c65UL, - 0x2de92c6f592b0275UL, 0x4a7484aa6ea6e483UL, - 0x5cb0a9dcbd41fbd4UL, 0x76f988da831153b5UL, - 0x983e5152ee66dfabUL, 0xa831c66d2db43210UL, - 0xb00327c898fb213fUL, 0xbf597fc7beef0ee4UL, - 0xc6e00bf33da88fc2UL, 0xd5a79147930aa725UL, - 0x06ca6351e003826fUL, 0x142929670a0e6e70UL, - 0x27b70a8546d22ffcUL, 0x2e1b21385c26c926UL, - 0x4d2c6dfc5ac42aedUL, 0x53380d139d95b3dfUL, - 0x650a73548baf63deUL, 0x766a0abb3c77b2a8UL, - 0x81c2c92e47edaee6UL, 0x92722c851482353bUL, - 0xa2bfe8a14cf10364UL, 0xa81a664bbc423001UL, - 0xc24b8b70d0f89791UL, 0xc76c51a30654be30UL, - 0xd192e819d6ef5218UL, 0xd69906245565a910UL, - 0xf40e35855771202aUL, 0x106aa07032bbd1b8UL, - 0x19a4c116b8d2d0c8UL, 0x1e376c085141ab53UL, - 0x2748774cdf8eeb99UL, 0x34b0bcb5e19b48a8UL, - 0x391c0cb3c5c95a63UL, 0x4ed8aa4ae3418acbUL, - 0x5b9cca4f7763e373UL, 0x682e6ff3d6b2b8a3UL, - 0x748f82ee5defb2fcUL, 0x78a5636f43172f60UL, - 0x84c87814a1f0ab72UL, 0x8cc702081a6439ecUL, - 0x90befffa23631e28UL, 0xa4506cebde82bde9UL, - 0xbef9a3f7b2c67915UL, 0xc67178f2e372532bUL, - 0xca273eceea26619cUL, 0xd186b8c721c0c207UL, - 0xeada7dd6cde0eb1eUL, 0xf57d4f7fee6ed178UL, - 0x06f067aa72176fbaUL, 0x0a637dc5a2c898a6UL, - 0x113f9804bef90daeUL, 0x1b710b35131c471bUL, - 0x28db77f523047d84UL, 0x32caab7b40c72493UL, - 0x3c9ebe0a15c9bebcUL, 0x431d67c49c100d4cUL, - 0x4cc5d4becb3e42b6UL, 0x597f299cfc657e2aUL, - 0x5fcb6fab3ad6faecUL, 0x6c44198c4a475817UL + 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, + 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL, + 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, + 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, + 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, + 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, + 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, + 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL, + 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, + 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, + 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, + 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, + 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, + 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL, + 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, + 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, + 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, + 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, + 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, + 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL, + 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, + 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, + 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, + 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, + 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, + 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL, + 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, + 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, + 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, + 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, + 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, + 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL, + 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, + 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, + 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, + 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, + 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, + 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL, + 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, + 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL }; /* Initial hash value H for SHA-384: */ static const isc_uint64_t sha384_initial_hash_value[8] = { - 0xcbbb9d5dc1059ed8UL, - 0x629a292a367cd507UL, - 0x9159015a3070dd17UL, - 0x152fecd8f70e5939UL, - 0x67332667ffc00b31UL, - 0x8eb44a8768581511UL, - 0xdb0c2e0d64f98fa7UL, - 0x47b5481dbefa4fa4UL + 0xcbbb9d5dc1059ed8ULL, + 0x629a292a367cd507ULL, + 0x9159015a3070dd17ULL, + 0x152fecd8f70e5939ULL, + 0x67332667ffc00b31ULL, + 0x8eb44a8768581511ULL, + 0xdb0c2e0d64f98fa7ULL, + 0x47b5481dbefa4fa4ULL }; /* Initial hash value H for SHA-512: */ static const isc_uint64_t sha512_initial_hash_value[8] = { - 0x6a09e667f3bcc908U, - 0xbb67ae8584caa73bUL, - 0x3c6ef372fe94f82bUL, - 0xa54ff53a5f1d36f1UL, - 0x510e527fade682d1UL, - 0x9b05688c2b3e6c1fUL, - 0x1f83d9abfb41bd6bUL, - 0x5be0cd19137e2179UL + 0x6a09e667f3bcc908ULL, + 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, + 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, + 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, + 0x5be0cd19137e2179ULL }; #else /* Hash constant words K for SHA-384 and SHA-512: */ Modified: branches/nslookup/dll/3rdparty/isc/win32/condition.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/condition.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/condition.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -249,10 +249,18 @@ } microseconds = isc_time_microdiff(t, &now); + +#ifdef __GNUC__ + if (microseconds > 0xFFFFFFFFull * 1000) + milliseconds = 0xFFFFFFFF; + else + milliseconds = (DWORD)(microseconds / 1000); +#else if (microseconds > 0xFFFFFFFFi64 * 1000) milliseconds = 0xFFFFFFFF; else milliseconds = (DWORD)(microseconds / 1000); +#endif return (wait(cond, mutex, milliseconds)); } Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/ipv6.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -84,6 +84,7 @@ /* * IPv4 compatible */ +#ifndef IN6_IS_ADDR_V4COMPAT #define IN6_IS_ADDR_V4COMPAT(a) (\ *((u_long *)((a)->s6_addr) ) == 0 && \ *((u_long *)((a)->s6_addr) + 1) == 0 && \ @@ -91,20 +92,25 @@ *((u_long *)((a)->s6_addr) + 3) != 0 && \ *((u_long *)((a)->s6_addr) + 3) != htonl(1) \ ) +#endif /* * Mapped */ +#ifndef IN6_IS_ADDR_V4MAPPED #define IN6_IS_ADDR_V4MAPPED(a) (\ *((u_long *)((a)->s6_addr) ) == 0 && \ *((u_long *)((a)->s6_addr) + 1) == 0 && \ *((u_long *)((a)->s6_addr) + 2) == htonl(0x0000ffff)) +#endif /* * Multicast */ +#ifndef IN6_IS_ADDR_MULTICAST #define IN6_IS_ADDR_MULTICAST(a) \ ((a)->s6_addr[0] == 0xffU) +#endif /* * Unicast link / site local. Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -97,11 +97,8 @@ #include <isc/lang.h> #include <isc/types.h> -#ifndef __REACTOS__ #include <ws2tcpip.h> -#endif - -#include <isc/ipv6.h> +#include "ipv6.h" /* * This is here because named client, interfacemgr.c, etc. use the name as @@ -120,16 +117,16 @@ }; #endif -#ifndef __REACTOS__ +/*#ifndef __REACTOS__ #if _MSC_VER < 1300 -#endif +#endif*/ #define in6addr_any isc_in6addr_any #define in6addr_loopback isc_in6addr_loopback -#ifndef __REACTOS__ -#endif -#endif +/*#ifndef __REACTOS__ +#endif +#endif*/ /* * Ensure type in_port_t is defined. Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/thread.h [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -30,35 +30,35 @@ */ /* check handle for NULL and INVALID_HANDLE */ -inline BOOL IsValidHandle( HANDLE hHandle) { +static inline BOOL IsValidHandle( HANDLE hHandle) { return ((hHandle != NULL) && (hHandle != INVALID_HANDLE_VALUE)); } /* validate wait return codes... */ -inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) { +static inline BOOL WaitSucceeded( DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_OBJECT_0) && (dwWaitResult < WAIT_OBJECT_0 + dwHandleCount)); } -inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) { +static inline BOOL WaitAbandoned( DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_ABANDONED_0) && (dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount)); } -inline BOOL WaitTimeout( DWORD dwWaitResult) { +static inline BOOL WaitTimeout( DWORD dwWaitResult) { return (dwWaitResult == WAIT_TIMEOUT); } -inline BOOL WaitFailed( DWORD dwWaitResult) { +static inline BOOL WaitFailed( DWORD dwWaitResult) { return (dwWaitResult == WAIT_FAILED); } /* compute object indices for waits... */ -inline DWORD WaitSucceededIndex( DWORD dwWaitResult) { +static inline DWORD WaitSucceededIndex( DWORD dwWaitResult) { return (dwWaitResult - WAIT_OBJECT_0); } -inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) { +static inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) { return (dwWaitResult - WAIT_ABANDONED_0); } Modified: branches/nslookup/dll/3rdparty/isc/win32/socket.c URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… ============================================================================== --- branches/nslookup/dll/3rdparty/isc/win32/socket.c [iso-8859-1] (original) +++ branches/nslookup/dll/3rdparty/isc/win32/socket.c [iso-8859-1] Sun Nov 1 03:17:33 2009 @@ -424,7 +424,7 @@ socket_log(int lineno, isc_socket_t *sock, isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_msgcat_t *msgcat, int msgset, int message, - const char *fmt, ...) ISC_FORMAT_PRINTF(9, 10); + const char *fmt, ...) ISC_FORMAT_PRINTF(10, 11); /* This function will add an entry to the I/O completion port * that will signal the I/O thread to exit (gracefully)

1 0

[ahill] 43890: [atlnew] - RosBE doesn't support __ImageBase, so use GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) instead. - Implement CAtlBaseModule constructor. [browseui] - Since RosBE built DLLs don't run global constructors, use placement new to construct them in DllMain. This is a *HACK* and a better solution should be found. - Change DllMain be be extern C so it actually gets used.
by ahill＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ahill Date: Sun Nov 1 00:40:09 2009 New Revision: 43890 URL: http://svn.reactos.org/svn/reactos?rev=43890&view=rev Log: [atlnew] - RosBE doesn't support __ImageBase, so use GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) instead. - Implement CAtlBaseModule constructor. [browseui] - Since RosBE built DLLs don't run global constructors, use placement new to construct them in DllMain. This is a *HACK* and a better solution should be found. - Change DllMain be be extern C so it actually gets used. Modified: trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/lib/atl/atlbase.h trunk/reactos/lib/atl/atlcore.h Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -61,12 +61,23 @@ CBrowseUIModule gModule; CAtlWinModule gWinModule; +void *operator new (size_t, void *buf) +{ + return buf; +} + /************************************************************************* * BROWSEUI DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) +STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) { TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); + + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CBrowseUIModule; + new (&gWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + if (dwReason == DLL_PROCESS_ATTACH) { gModule.Init(ObjectMap, hInstance, NULL); Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=4389… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -53,8 +53,6 @@ #define offsetofclass(base, derived) (reinterpret_cast<DWORD_PTR>(static_cast<base *>(reinterpret_cast<derived *>(_ATL_PACKING))) - _ATL_PACKING) -extern "C" IMAGE_DOS_HEADER __ImageBase; - namespace ATL { @@ -451,7 +449,7 @@ public: CAtlComModule() { - m_hInstTypeLib = reinterpret_cast<HINSTANCE>(&__ImageBase); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)this, &m_hInstTypeLib); m_ppAutoObjMapFirst = NULL; m_ppAutoObjMapLast = NULL; if (FAILED(m_csObjMap.Init())) Modified: trunk/reactos/lib/atl/atlcore.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlcore.h?rev=4389… ============================================================================== --- trunk/reactos/lib/atl/atlcore.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlcore.h [iso-8859-1] Sun Nov 1 00:40:09 2009 @@ -181,6 +181,13 @@ public : static bool m_bInitFailed; public: + CAtlBaseModule() + { + cbSize = sizeof(_ATL_BASE_MODULE); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)this, &m_hInst); + m_hInstResource = m_hInst; + } + HINSTANCE GetModuleInstance() { return m_hInst;

1 0

[ablackmann] 43889: Implement DoCOMPANY, DoCOPYRIGHT, DoVERSION and DoLOCALENAME... that was the easy part. Happy Halloween everybody!
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 23:18:28 2009 New Revision: 43889 URL: http://svn.reactos.org/svn/reactos?rev=43889&view=rev Log: Implement DoCOMPANY, DoCOPYRIGHT, DoVERSION and DoLOCALENAME... that was the easy part. Happy Halloween everybody! Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sat Oct 31 23:18:28 2009 @@ -23,8 +23,12 @@ extern FILE* gfpInput; CHAR gBuf[256]; CHAR gKBDName[10]; +CHAR gCopyright[256]; CHAR gDescription[256]; +CHAR gCompany[256]; +CHAR gLocaleName[256]; ULONG gID = 0; +ULONG gKbdLayoutVersion; CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = @@ -132,8 +136,6 @@ ULONG DoKBD(VOID) { - PCHAR p; - /* On Unicode files, we need to find the Unicode marker (FEEF) */ ASSERT(UnicodeFile == FALSE); @@ -156,25 +158,70 @@ ULONG DoVERSION(VOID) -{ +{ + /* Scan for the value */ + if (sscanf(gBuf, "VERSION %d", &gKbdLayoutVersion) < 1) + { + /* Couldn't find them */ + printf("Unable to read keyboard version information.\n"); + } + + /* Debug only */ + DPRINT1("VERSION [%d]\n", gKbdLayoutVersion); return SkipLines(); } ULONG DoCOPYRIGHT(VOID) { + /* Initial values */ + *gCopyright = '\0'; + + /* Scan for the value */ + if (sscanf(gBuf, "COPYRIGHT \"%40[^\"]\"", gCopyright) < 1) + { + /* Couldn't find them */ + printf("Unable to read the specified COPYRIGHT string.\n"); + } + + /* Debug only */ + DPRINT1("COPYRIGHT [%40s]\n", gCopyright); return SkipLines(); } ULONG DoCOMPANY(VOID) { + /* Initial values */ + *gCompany = '\0'; + + /* Scan for the value */ + if (sscanf(gBuf, "COMPANY \"%85[^\"]\"", gCompany) < 1) + { + /* Couldn't find them */ + printf("Unable to read the specified COMPANY name.\n"); + } + + /* Debug only */ + DPRINT1("COMPANY [%85s]\n", gCompany); return SkipLines(); } ULONG DoLOCALENAME(VOID) { + /* Initial values */ + *gLocaleName = '\0'; + + /* Scan for the value */ + if (sscanf(gBuf, "LOCALENAME \"%40[^\"]\"", gLocaleName) < 1) + { + /* Couldn't find them */ + printf("Unable to read the specified COPYRIGHT string.\n"); + } + + /* Debug only */ + DPRINT1("LOCALENAME [%40s]\n", gLocaleName); return SkipLines(); }

1 0

[ablackmann] 43888: Implement DoKBD. The tool can now handle the KBD section of a .klc layout.
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 22:54:26 2009 New Revision: 43888 URL: http://svn.reactos.org/svn/reactos?rev=43888&view=rev Log: Implement DoKBD. The tool can now handle the KBD section of a .klc layout. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sat Oct 31 22:54:26 2009 @@ -18,10 +18,13 @@ #define KEYWORD_COUNT 17 -extern BOOLEAN Verbose; +extern BOOLEAN Verbose, UnicodeFile; extern PCHAR gpszFileName; extern FILE* gfpInput; CHAR gBuf[256]; +CHAR gKBDName[10]; +CHAR gDescription[256]; +ULONG gID = 0; CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = @@ -129,6 +132,25 @@ ULONG DoKBD(VOID) { + PCHAR p; + + /* On Unicode files, we need to find the Unicode marker (FEEF) */ + ASSERT(UnicodeFile == FALSE); + + /* Initial values */ + *gKBDName = '\0'; + *gDescription = '\0'; + + /* Scan for the values */ + if (sscanf(gBuf, "KBD %8s \"%40[^\"]\" %d", gKBDName, gDescription, &gID) < 2) + { + /* Couldn't find them */ + printf("Unable to read keyboard name or description.\n"); + exit(1); + } + + /* Debug only */ + DPRINT1("KBD Name: [%8s] Description: [%40s] ID: [%d]\n", gKBDName, gDescription, gID); return SkipLines(); }

1 0

[fireball] 43887: - Start working on proper window managing: Implement a very simple window manager, responsible for redrawing top-level windows (Swm* APIs in win32k). - Remove all previous hacks related to window redrawing in events of move or focus change. They couldn't work properly. - Wine's win32 engine really expects mouse events to be tagged by a corresponding window's handle. Make it so using SWM. - All these changes make arwinss usability actually regress (mostly due to removing unneces
by fireball＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: fireball Date: Sat Oct 31 21:55:25 2009 New Revision: 43887 URL: http://svn.reactos.org/svn/reactos?rev=43887&view=rev Log: - Start working on proper window managing: Implement a very simple window manager, responsible for redrawing top-level windows (Swm* APIs in win32k). - Remove all previous hacks related to window redrawing in events of move or focus change. They couldn't work properly. - Wine's win32 engine really expects mouse events to be tagged by a corresponding window's handle. Make it so using SWM. - All these changes make arwinss usability actually regress (mostly due to removing unnecessary hacks and problems in other components). Added: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/swm/ (with props) branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/wnd.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -71,6 +71,9 @@ /* Update brush origin */ GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", + // xDst, yDst, width, height, xSrc, ySrc); return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); @@ -669,6 +672,8 @@ HRGN dc_rgn; DWORD size; + //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); + /* Create a dummy region (FIXME: create it once!) */ dc_rgn = CreateRectRgn(0,0,0,0); if (!dc_rgn) return; Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -188,6 +188,10 @@ { GetCursorPos(&pt); } + + hwnd = SwmGetWindowFromPoint(pt.x, pt.y); + + FIXME("hwnd %x\n", hwnd); if (flags & MOUSEEVENTF_MOVE) { Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -58,9 +58,9 @@ hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } - //ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", - // data->hwnd, parent, - // wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); + FIXME( "copying bits for win %p (parent %p)/ %s -> %s\n", + data->hwnd, parent, + wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); BitBlt( hdc_dst, dst_rect.left, dst_rect.top, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); @@ -723,10 +723,9 @@ void CDECL RosDrv_SetFocus( HWND hwnd ) { - RECT rc; - //UNIMPLEMENTED; - GetWindowRect(hwnd, &rc); - RosDrv_UpdateZOrder(hwnd, &rc); + TRACE("SetFocus %x, desk %x\n", hwnd, GetDesktopWindow()); + if (GetDesktopWindow() != hwnd) + SwmSetForeground(hwnd); } void CDECL RosDrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) @@ -765,7 +764,7 @@ !(data = NTDRV_create_win_data( hwnd ))) return; /* Do some magic... */ - TRACE("Window %x is being made visible\n", hwnd); + FIXME("Window %x is being made visible1\n", hwnd); } if (offset == GWL_STYLE && (changed & WS_DISABLED)) @@ -787,7 +786,7 @@ UINT CDECL RosDrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - TRACE( "win %p cmd %d at %s flags %08x\n", + FIXME( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); return swp; @@ -819,6 +818,11 @@ if (!(data = NTDRV_create_win_data( hwnd ))) return; } + SwmPosChanging(hwnd, window_rect); + + TRACE( "win %x pos is changing. vis rect %s, win rect %s\n", + hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(window_rect) ); + *visible_rect = *window_rect; } @@ -833,6 +837,9 @@ struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); if (!data) return; + + TRACE( "win %x pos changed. new vis rect %s, old whole rect %s\n", + hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(&data->whole_rect) ); old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; @@ -855,11 +862,12 @@ old_client_rect.bottom - data->client_rect.bottom == y_offset && !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { - move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); + //move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); + SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect); } else { - move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); + //move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } } Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -18,6 +18,7 @@ #define NTOS_USER_MODE #include <ndk/ntndk.h> #include "ntrosgdi.h" +#include "win32k/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" @@ -94,7 +95,15 @@ TRACE( "win %p window %s whole %s client %s\n", hwnd, wine_dbgstr_rect( &data->window_rect ), wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); + + /* Inform window manager about window rect in screen coords */ + SwmAddWindow(hwnd, &data->window_rect); } + + /* Add desktop window too */ + if (hwnd == GetDesktopWindow()) + SwmAddWindow(hwnd, &data->window_rect); + return data; } @@ -111,6 +120,9 @@ /* Remove property */ RemovePropA( hwnd, window_data_prop ); + /* Inform window manager */ + SwmRemoveWindow( hwnd ); + /* Free window data */ HeapFree( GetProcessHeap(), 0, data ); } Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -136,4 +136,23 @@ VOID NTAPI RosUserConnectCsrss(VOID); +VOID NTAPI +SwmAddWindow(HWND hWnd, RECT *WindowRect); + +VOID NTAPI +SwmRemoveWindow(HWND hWnd); + +VOID NTAPI +SwmSetForeground(HWND hWnd); + +VOID NTAPI +SwmPosChanging(HWND hWnd, const RECT *WindowRect); + +VOID NTAPI +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect); + +HWND NTAPI +SwmGetWindowFromPoint(LONG x, LONG y); + + #endif /* __WIN32K_NTUSER_H */ Added: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -1,0 +1,6 @@ +#ifndef SWM__H +#define SWM__H + +VOID NTAPI SwmInitialize(); + +#endif Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -53,6 +53,7 @@ #include <xlateobj.h> #include <gre.h> #include <monitor.h> +#include <swm.h> #include "winesup.h" Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -329,6 +329,9 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); + /* Initialize window manager */ + SwmInitialize(); + /* Create stock objects */ CreateStockBitmap(); PALETTE_Init(); Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 31 21:55:25 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -1,0 +1,719 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/swm/winman.c + * PURPOSE: Simple Window Manager + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +#include "object.h" +#include "handle.h" +#include "user.h" + +#define NDEBUG +#include <debug.h> + +typedef struct _SWM_WINDOW +{ + HWND hwnd; + rectangle_t Window; + struct region *Visible; + struct region *Invisible; + + LIST_ENTRY Entry; +} SWM_WINDOW, *PSWM_WINDOW; + +/*static*/ inline struct window *get_window( user_handle_t handle ); +void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ); +void req_update_window_zorder( const struct update_window_zorder_request *req, struct update_window_zorder_reply *reply ); + +VOID NTAPI SwmDumpRegion(struct region *Region); +VOID NTAPI SwmDumpWindows(); +VOID NTAPI SwmDebugDrawWindows(); +VOID NTAPI SwmTest(); + + +/* GLOBALS *******************************************************************/ + +LIST_ENTRY SwmWindows; +ERESOURCE SwmLock; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +SwmAcquire(VOID) +{ + /* Acquire user resource exclusively */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&SwmLock, TRUE); +} + +VOID +NTAPI +SwmRelease(VOID) +{ + /* Release user resource */ + ExReleaseResourceLite(&SwmLock); + KeLeaveCriticalRegion(); +} + +VOID +NTAPI +SwmInvalidateRegion(PSWM_WINDOW Window, struct region *Region, rectangle_t *Rect) +{ + struct window *Win; + struct update_window_zorder_request req; + //struct update_window_zorder_reply reply; + struct region *ClientRegion; + + ClientRegion = create_empty_region(); + copy_region(ClientRegion, Region); + + /* Calculate what areas to paint */ + UserEnterExclusive(); + + DPRINT1("SwmInvalidateRegion hwnd %x, region:\n", Window->hwnd); + SwmDumpRegion(Region); + Win = get_window((UINT_PTR)Window->hwnd); + if (!Win) + { + UserLeave(); + return; + } + + /* Convert region to client coordinates */ + offset_region(ClientRegion, -Window->Window.left, -Window->Window.top); + + //DPRINT1("rect (%d,%d)-(%d,%d)\n", TmpRect.left, TmpRect.top, TmpRect.right, TmpRect.bottom); + + /* Update zorder */ + if (Rect) + { + req.rect = *Rect; + req.rect.left -= Window->Window.left; req.rect.top -= Window->Window.top; + req.rect.right -= Window->Window.left; req.rect.bottom -= Window->Window.left; + req.window = (UINT_PTR)Window->hwnd; + //req_update_window_zorder(&req, &reply); + } + + /* Redraw window */ + redraw_window(Win, ClientRegion, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); + + UserLeave(); + + free_region(ClientRegion); +} + +VOID +NTAPI +SwmMarkInvisible(struct region *Region) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *WindowRegion; + struct region *InvisibleRegion; + + /* Make a copy of the invisible region */ + InvisibleRegion = create_empty_region(); + copy_region(InvisibleRegion, Region); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Get window's region */ + WindowRegion = create_empty_region(); + set_region_rect(WindowRegion, &Window->Window); + + //DPRINT1("Window region ext:\n"); + //SwmDumpRegion(WindowRegion); + //DPRINT1("Region to mark invisible ext:\n"); + //SwmDumpRegion(Region); + + /* Region to mark invisible for this window = Update region X Window region */ + intersect_region(WindowRegion, WindowRegion, InvisibleRegion); + + /* Check if it's empty */ + if (!is_region_empty(WindowRegion)) + { + //DPRINT1("Subtracting region\n"); + //SwmDumpRegion(WindowRegion); + //DPRINT1("From visible region\n"); + //SwmDumpRegion(Window->Visible); + + /* If it's not empty, subtract it from visible region */ + subtract_region(Window->Visible, Window->Visible, WindowRegion); + + /* And subtract that part from our invisible region */ + subtract_region(InvisibleRegion, InvisibleRegion, WindowRegion); + } + + free_region(WindowRegion); + + /* Break if our whole invisible region is mapped to underlying windows */ + if (is_region_empty(InvisibleRegion)) break; + + /* Advance to the next window */ + Current = Current->Flink; + } + + free_region(InvisibleRegion); +} + +/* NOTE: It alters the passed region! */ +VOID +NTAPI +SwmMarkVisible(struct region *Region) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *WindowRegion; + + /* Go through every window from nearest to farthest */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Get window's region */ + WindowRegion = create_empty_region(); + set_region_rect(WindowRegion, &Window->Window); + + /* Region to mark invisible for this window = Update region X Window region */ + intersect_region(WindowRegion, WindowRegion, Region); + + /* Check if it's empty */ + if (!is_region_empty(WindowRegion)) + { + DPRINT1("Invalidating region\n"); + SwmDumpRegion(WindowRegion); + DPRINT1("of window %x\n", Window->hwnd); + + /* If it's not empty, subtract it from the source region */ + subtract_region(Region, Region, WindowRegion); + + /* And add it to this window's visible region */ + union_region(Window->Visible, Window->Visible, WindowRegion); + + /* Invalidate this region of target window */ + SwmInvalidateRegion(Window, WindowRegion, NULL); + + DPRINT1("Rest of the update region is:\n"); + SwmDumpRegion(Region); + } + + free_region(WindowRegion); + + /* If region to update became empty, quit */ + if (is_region_empty(Region)) break; + + /* Advance to the next window */ + Current = Current->Flink; + } +} + +VOID +NTAPI +SwmRecalculateVisibility(PSWM_WINDOW CalcWindow) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + struct region *Region = create_empty_region(); + struct region *WindowRegion = create_empty_region(); + + set_region_rect(WindowRegion, &CalcWindow->Window); + + /* Compile a total region of visible regions of "higher" windows */ + Current = &CalcWindow->Entry; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + union_region(Region, Region, Window->Visible); + + /* Advance to the previous window */ + Current = Current->Blink; + } + + /* Crop the region against target window */ + intersect_region(Region, Region, WindowRegion); + + /* Subtract result from target window's visible region */ + subtract_region(CalcWindow->Visible, WindowRegion, Region); + + /* Free allocated temporary regions */ + free_region(Region); + free_region(WindowRegion); +} + +VOID +NTAPI +SwmAddWindow(HWND hWnd, RECT *WindowRect) +{ + PSWM_WINDOW Win; + + DPRINT1("SwmAddWindow %x\n", hWnd); + DPRINT1("rect (%d,%d)-(%d,%d)\n", WindowRect->left, WindowRect->top, WindowRect->right, WindowRect->bottom); + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + Win = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); + RtlZeroMemory(Win, sizeof(SWM_WINDOW)); + Win->hwnd = hWnd; + Win->Window.left = WindowRect->left; + Win->Window.top = WindowRect->top; + Win->Window.right = WindowRect->right; + Win->Window.bottom = WindowRect->bottom; + + Win->Visible = create_empty_region(); + set_region_rect(Win->Visible, &Win->Window); + + /* Now go through the list and remove this rect from all underlying windows visible region */ + SwmMarkInvisible(Win->Visible); + + InsertHeadList(&SwmWindows, &Win->Entry); + + /* Now ensure it is visible on screen */ + SwmInvalidateRegion(Win, Win->Visible, &Win->Window); + + //SwmDumpWindows(); + //SwmDebugDrawWindows(); + + /* Release the lock */ + SwmRelease(); +} + +PSWM_WINDOW +NTAPI +SwmFindByHwnd(HWND hWnd) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Check if it's our entry */ + if (Window->hwnd == hWnd) + { + /* Found it, save it and break out of the loop */ + return Window; + } + + /* Advance to the next window */ + Current = Current->Flink; + } + + return NULL; +} + +VOID +NTAPI +SwmRemoveWindow(HWND hWnd) +{ + PSWM_WINDOW Win; + + /* Acquire the lock */ + SwmAcquire(); + + DPRINT1("SwmRemoveWindow %x\n", hWnd); + + /* Allocate entry */ + Win = SwmFindByHwnd(hWnd); + //ASSERT(Win != NULL); + if (!Win) + { + /* Release the lock */ + SwmRelease(); + + return; + } + + RemoveEntryList(&Win->Entry); + + /* Mark this region as visible in other window */ + SwmMarkVisible(Win->Visible); + + /* Free the entry */ + free_region(Win->Visible); + ExFreePool(Win); + + /* Release the lock */ + SwmRelease(); +} + +VOID +NTAPI +SwmSetForeground(HWND hWnd) +{ + PSWM_WINDOW SwmWin, Previous; + struct region *OldVisible; + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + SwmWin = SwmFindByHwnd(hWnd); + //ASSERT(SwmWin != NULL); + if (!SwmWin) + { + /* Release the lock */ + SwmRelease(); + return; + } + + /* Save previous focus window */ + Previous = CONTAINING_RECORD(SwmWindows.Flink, SWM_WINDOW, Entry); + + /* It's already on top */ + if (Previous->hwnd == hWnd) + { + DPRINT1("hwnd %x is already on top\n", hWnd); + /* Release the lock */ + SwmRelease(); + return; + } + + DPRINT1("Setting %x as foreground, previous window was %x\n", hWnd, Previous->hwnd); + + /* Remove it from the list */ + RemoveEntryList(&SwmWin->Entry); + + /* Add it to the head of the list */ + InsertHeadList(&SwmWindows, &SwmWin->Entry); + + /* Make it fully visible */ + OldVisible = create_empty_region(); + copy_region(OldVisible, SwmWin->Visible); + + free_region(SwmWin->Visible); + SwmWin->Visible = create_empty_region(); + set_region_rect(SwmWin->Visible, &SwmWin->Window); + + /* Intersect new visible and old visible to find region for updating */ + intersect_region(OldVisible, OldVisible, SwmWin->Visible); + + /* If it's not empty - draw missing parts */ + if (!is_region_empty(OldVisible)) + SwmInvalidateRegion(SwmWin, OldVisible, NULL); + + free_region(OldVisible); + + /* Update previous window's visible region */ + SwmRecalculateVisibility(Previous); + + /* Release the lock */ + SwmRelease(); +} + +VOID +NTAPI +SwmPosChanging(HWND hWnd, const RECT *WindowRect) +{ +} + +VOID +NTAPI +SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect) +{ + PSWM_WINDOW SwmWin; + struct region *NewRegion; + rectangle_t WinRect; + + /* Acquire the lock */ + SwmAcquire(); + + /* Allocate entry */ + SwmWin = SwmFindByHwnd(hWnd); + if (!SwmWin) + { + /* Release the lock */ + SwmRelease(); + return; + } + + SwmWin->Window.left = WindowRect->left; + SwmWin->Window.top = WindowRect->top; + SwmWin->Window.right = WindowRect->right; + SwmWin->Window.bottom = WindowRect->bottom; + + //SwmDebugDrawWindows(); + + /* Assure the moving window is foreground */ + ASSERT(SwmWindows.Flink == &SwmWin->Entry); + + /* Create a region describing new position */ + NewRegion = create_empty_region(); + WinRect.left = WindowRect->left; WinRect.top = WindowRect->top; + WinRect.right = WindowRect->right; WinRect.bottom = WindowRect->bottom; + set_region_rect(NewRegion, &WinRect); + + /* Intersect it with the old region */ + intersect_region(NewRegion, NewRegion, SwmWin->Visible); + + /* This window's visibility region will just move, because it + really equals window's rect. */ + offset_region(SwmWin->Visible, + WindowRect->left - OldRect->left, + WindowRect->top - OldRect->top); + + /* NewRegion now holds the difference. Mark it visible. */ + SwmMarkVisible(NewRegion); + free_region(NewRegion); + + /* Redraw window itself too */ + //SwmInvalidateRegion(SwmWin, SwmWin->Visible, NULL); + + /* Release the lock */ + SwmRelease(); +} + +HWND +NTAPI +SwmGetWindowFromPoint(LONG x, LONG y) +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + /* Acquire the lock */ + SwmAcquire(); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + if (point_in_region(Window->Visible, x, y)) + { + /* Release the lock */ + SwmRelease(); + + return Window->hwnd; + } + + /* Advance to the next window */ + Current = Current->Flink; + } + + /* Release the lock */ + SwmRelease(); + + return 0; +} + + +VOID +NTAPI +SwmInitialize() +{ + NTSTATUS Status; + + /* Initialize handles list and a spinlock */ + InitializeListHead(&SwmWindows); + + /* Initialize SWM access resource */ + Status = ExInitializeResourceLite(&SwmLock); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure initializing SWM resource!\n"); + } + + SwmTest(); +} + +// haaaaaaaaaaaaaaaaaaack +struct region +{ + int size; + int num_rects; + rectangle_t *rects; + rectangle_t extents; +}; + +VOID +NTAPI +SwmDumpRegion(struct region *Region) +{ + ULONG i; + + //get_region_extents(Region, &ExtRect); + + for (i=0; i<Region->num_rects; i++) + { + DbgPrint("(%d,%d)-(%d,%d) ", Region->rects[i].left, Region->rects[i].top, + Region->rects[i].right, Region->rects[i].bottom); + } + + DbgPrint("\n"); +} + +VOID +NTAPI +SwmDumpWindows() +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + + DPRINT1("Windows in z order: "); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + DbgPrint("%x regions: \n", Window->hwnd); + SwmDumpRegion(Window->Visible); + + /* Advance to the next window */ + Current = Current->Flink; + } + + DbgPrint("\n"); +} + +VOID +NTAPI +SwmDebugDrawRect(HDC hDC, rectangle_t *Rect, ULONG Color) +{ + PDC pDC; + ULONG Scale = 4; + + /* Get a pointer to the DC */ + pDC = DC_Lock(hDC); + + pDC->pLineBrush->BrushObj.iSolidColor = Color; + + GreRectangle(pDC, Rect->left / Scale, Rect->top / Scale, Rect->right / Scale, Rect->bottom / Scale); + + /* Release the object */ + DC_Unlock(pDC); +} + +VOID +NTAPI +SwmDebugDrawRegion(HDC hDC, struct region *Region, ULONG Color) +{ + PDC pDC; + ULONG Scale = 4, i; + + if (is_region_empty(Region)) return; + + /* Get a pointer to the DC */ + pDC = DC_Lock(hDC); + + pDC->pLineBrush->BrushObj.iSolidColor = Color; + + for (i=0; i<Region->num_rects; i++) + GreRectangle(pDC, Region->rects[i].left / Scale, Region->rects[i].top / Scale, + Region->rects[i].right / Scale, Region->rects[i].bottom / Scale); + + /* Release the object */ + DC_Unlock(pDC); +} + +VOID +NTAPI +SwmDebugDrawWindows() +{ + PLIST_ENTRY Current; + PSWM_WINDOW Window; + HDC ScreenDc = 0; + ROS_DCINFO RosDc = {0}; + PBRUSHGDI Brush, BrushBack; + PDC pDC; + RECTL rcSafeBounds; + + /* Create a dc */ + RosGdiCreateDC(&RosDc, &ScreenDc, L"", L"", L"", NULL); + + /* Create a pen and select it */ + Brush = GreCreateSolidBrush(RGB(0xFF, 0, 0)); + + /* Get a pointer to the DC */ + pDC = DC_Lock(ScreenDc); + GreFreeBrush(pDC->pLineBrush); + pDC->pLineBrush = Brush; + + /* Set the clipping object */ + IntEngDeleteClipRegion(pDC->CombinedClip); + RECTL_vSetRect(&rcSafeBounds, + 0, + 0, + 640, + 480); + + pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); + + /* Clear the area */ + BrushBack = pDC->pFillBrush; + pDC->pFillBrush = GreCreateSolidBrush(RGB(0,0,0)); + GreRectangle(pDC, 0, 0, 800/4, 600/4); + GreFreeBrush(pDC->pFillBrush); + pDC->pFillBrush = BrushBack; + + DC_Unlock(pDC); + + /* Traverse the list to find our window */ + Current = SwmWindows.Flink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + SwmDebugDrawRect(ScreenDc, &Window->Window, RGB(0,0,255)); + SwmDebugDrawRegion(ScreenDc, Window->Visible, RGB(255,0,0)); + + /* Advance to the next window */ + Current = Current->Flink; + } + + /* Delete screen dc */ + GreFreeBrush(Brush); + RosGdiDeleteDC(ScreenDc); +} + +VOID +NTAPI +SwmTest() +{ +#if 0 + RECT rect; + HWND hwnd; + + /* "desktop" */ + hwnd = (HWND)1; + rect.left = 0; rect.top = 0; + rect.right = 100; rect.bottom = 100; + SwmAddWindow(hwnd, &rect); + + /* win1 */ + hwnd = (HWND)2; + rect.left = 40; rect.top = 40; + rect.right = 60; rect.bottom = 60; + SwmAddWindow(hwnd, &rect); + + /* win2 */ + hwnd = (HWND)3; + rect.left = 50; rect.top = 50; + rect.right = 70; rect.bottom = 70; + SwmAddWindow(hwnd, &rect); + + SwmDumpWindows(); +#endif +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -81,4 +81,10 @@ RosUserGetKeyNameText 3 RosUserToUnicodeEx 7 RosUserMapVirtualKeyEx 4 -RosUserGetAsyncKeyState 1 +RosUserGetAsyncKeyState 1 +SwmAddWindow 2 +SwmRemoveWindow 1 +SwmSetForeground 1 +SwmPosChanging 2 +SwmPosChanged 3 +SwmGetWindowFromPoint 2 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -116,6 +116,9 @@ <file>kbdlayout.c</file> <file>keyboard.c</file> </directory> + <directory name="swm"> + <file>winman.c</file> + </directory> <directory name="wine"> <file>atom.c</file> <file>class.c</file> Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Sat Oct 31 21:55:25 2009 @@ -110,7 +110,7 @@ #define WINPTR_NOTOPMOST ((struct window *)4L) /* retrieve a pointer to a window from its handle */ -static inline struct window *get_window( user_handle_t handle ) +/*static*/ inline struct window *get_window( user_handle_t handle ) { struct window *ret = get_user_object( handle, USER_WINDOW ); if (!ret) set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); @@ -1231,7 +1231,7 @@ /* add/subtract a region (in client coordinates) to the update region of the window */ -static void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) +/*static*/ void redraw_window( struct window *win, struct region *region, int frame, unsigned int flags ) { struct region *tmp; struct window *child;

1 0

[ablackmann] 43886: Implement stubs for all the different keyword stub-parsers.
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 21:24:33 2009 New Revision: 43886 URL: http://svn.reactos.org/svn/reactos?rev=43886&view=rev Log: Implement stubs for all the different keyword stub-parsers. Modified: trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sat Oct 31 21:24:33 2009 @@ -22,6 +22,7 @@ extern PCHAR gpszFileName; extern FILE* gfpInput; CHAR gBuf[256]; +CHAR g_Layout[4096]; ULONG gLineCount; PCHAR KeyWordList[KEYWORD_COUNT] = { @@ -125,11 +126,104 @@ return KEYWORD_COUNT; } +ULONG +DoKBD(VOID) +{ + return SkipLines(); +} + +ULONG +DoVERSION(VOID) +{ + return SkipLines(); +} + +ULONG +DoCOPYRIGHT(VOID) +{ + return SkipLines(); +} + +ULONG +DoCOMPANY(VOID) +{ + return SkipLines(); +} + +ULONG +DoLOCALENAME(VOID) +{ + return SkipLines(); +} + +ULONG +DoMODIFIERS(VOID) +{ + return SkipLines(); +} + +ULONG +DoDESCRIPTIONS(PVOID DescriptionData) +{ + return SkipLines(); +} + +ULONG +DoKEYNAME(PVOID KeyNameData) +{ + return SkipLines(); +} + +ULONG +DoLIGATURE(PVOID LigatureData) +{ + return SkipLines(); +} + +ULONG +DoATTRIBUTES(PVOID AttributeData) +{ + return SkipLines(); +} + +ULONG +DoLANGUAGENAMES(PVOID LanguageData) +{ + return SkipLines(); +} + +ULONG +DoDEADKEY(PVOID DeadKeyData) +{ + return SkipLines(); +} + +ULONG +DoSHIFTSTATE(IN PULONG StateCount, + IN OUT PULONG ShiftStates) +{ + *StateCount = 10; + return SkipLines(); +} + +ULONG +DoLAYOUT(IN PVOID LayoutData, + IN PVOID LigatureData, + IN PULONG ShiftStates, + IN ULONG StateCount) +{ + return SkipLines(); +} + VOID DoParsing(VOID) { ULONG KeyWords[KEYWORD_COUNT]; ULONG KeyWord; + ULONG StateCount; + ULONG ShiftStates[8]; + PVOID AttributeData, LigatureData, DeadKeyData, DescriptionData; + PVOID KeyNameData, KeyNameExtData, KeyNameDeadData, LanguageData; /* Parse keywords */ gLineCount = 0; @@ -155,6 +249,7 @@ printf("The '%s' keyword appeared multiple times.\n", KeyWordList[KeyWord]); } + /* Now parse this keyword */ switch (KeyWord) @@ -163,112 +258,122 @@ case 0: printf("Found KBD section\n"); - KeyWord = SkipLines(); + KeyWord = DoKBD(); break; /* VERSION */ case 1: printf("Found VERSION section\n"); - KeyWord = SkipLines(); + KeyWord = DoVERSION(); break; /* COPYRIGHT */ case 2: printf("Found COPYRIGHT section\n"); - KeyWord = SkipLines(); + KeyWord = DoCOPYRIGHT(); break; /* COMPANY */ case 3: printf("Found COMPANY section\n"); - KeyWord = SkipLines(); + KeyWord = DoCOMPANY(); break; /* LOCALENAME */ case 4: printf("Found LOCALENAME section\n"); - KeyWord = SkipLines(); + KeyWord = DoLOCALENAME(); break; /* MODIFIERS */ case 5: printf("Found MODIFIERS section\n"); - KeyWord = SkipLines(); + KeyWord = DoMODIFIERS(); break; /* SHIFTSTATE */ case 6: printf("Found SHIFTSTATE section\n"); - KeyWord = SkipLines(); + KeyWord = DoSHIFTSTATE(&StateCount, ShiftStates); + if (StateCount < 2) + { + /* Fail */ + fclose(gfpInput); + printf("ERROR"); + exit(1); + } break; /* ATTRIBUTES */ case 7: printf("Found ATTRIBUTES section\n"); - KeyWord = SkipLines(); + KeyWord = DoATTRIBUTES(&AttributeData); break; /* LAYOUT */ case 8: printf("Found LAYOUT section\n"); - KeyWord = SkipLines(); + KeyWord = DoLAYOUT(&g_Layout, + &LigatureData, + ShiftStates, + StateCount); break; /* DEADKEY */ case 9: printf("Found DEADKEY section\n"); - KeyWord = SkipLines(); + KeyWord = DoDEADKEY(&DeadKeyData); break; /* LIGATURE */ case 10: printf("Found LIGATURE section\n"); - KeyWord = SkipLines(); + KeyWord = DoLIGATURE(&LigatureData); break; /* KEYNAME */ case 11: printf("Found KEYNAME section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameData); break; /* KEYNAME_EXT */ case 12: printf("Found KEYNAME_EXT section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameExtData); break; /* KEYNAME_DEAD */ case 13: printf("Found KEYNAME_DEAD section\n"); - KeyWord = SkipLines(); + KeyWord = DoKEYNAME(&KeyNameDeadData); break; /* DESCRIPTIONS */ case 14: printf("Found DESCRIPTIONS section\n"); - KeyWord = SkipLines(); + KeyWord = DoDESCRIPTIONS(&DescriptionData); break; /* LANGUAGENAMES */ case 15: printf("Found LANGUAGENAMES section\n"); - KeyWord = SkipLines(); + KeyWord = DoLANGUAGENAMES(&LanguageData); break; /* ENDKBD */

1 0

[ablackmann] 43885: Start implementing the main parser loop. The tool detects the keywords in the test.klc layout... and that's about all it does for now.
by ablackmann＠svn.reactos.org 31 Oct '09

31 Oct '09

Author: ablackmann Date: Sat Oct 31 21:03:43 2009 New Revision: 43885 URL: http://svn.reactos.org/svn/reactos?rev=43885&view=rev Log: Start implementing the main parser loop. The tool detects the keywords in the test.klc layout... and that's about all it does for now. Modified: trunk/reactos/tools/kbdtool/main.c trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Sat Oct 31 21:03:43 2009 @@ -26,8 +26,8 @@ /* FUNCTIONS ******************************************************************/ -void -usage() +VOID +PrintUsage(VOID) { /* This is who we are */ printf("\nKbdTool v%d.%02d - convert keyboard text file to C file or a keyboard layout DLL\n\n", @@ -57,9 +57,9 @@ printf("should not be here"); } -int -main(int argc, - char** argv) +INT +main(INT argc, + PCHAR* argv) { CHAR Option; PCHAR OpenFlags; @@ -145,13 +145,13 @@ } /* If you got here, the options are invalid or missing */ - usage(); + PrintUsage(); } break; } /* Do we have no options? */ - if (optind == argc) usage(); + if (optind == argc) PrintUsage(); /* Should we announce ourselves? */ if (!NoLogo) @@ -213,6 +213,12 @@ /* Now inform the user */ printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); } + + /* Now parse the keywords */ + DoParsing(); + + /* We are done */ + fclose(gfpInput); /* Now do something... */ printf("Like a rock...\n"); Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Sat Oct 31 21:03:43 2009 @@ -16,6 +16,272 @@ /* GLOBALS ********************************************************************/ +#define KEYWORD_COUNT 17 + +extern BOOLEAN Verbose; +extern PCHAR gpszFileName; +extern FILE* gfpInput; +CHAR gBuf[256]; +ULONG gLineCount; +PCHAR KeyWordList[KEYWORD_COUNT] = +{ + "KBD", + "VERSION", + "COPYRIGHT", + "COMPANY", + "LOCALENAME", + "MODIIFERS", + "SHIFTSTATE", + "ATTRIBUTES", + "LAYOUT", + "DEADKEY", + "LIGATURE", + "KEYNAME", + "KEYNAME_EXT", + "KEYNAME_DEAD", + "DESCRIPTIONS", + "LANGUAGENAMES", + "ENDKBD", +}; + /* FUNCTIONS ******************************************************************/ +ULONG +isKeyWord(PCHAR p) +{ + ULONG i; + + /* Check if we know this keyword */ + for (i = 0; i < KEYWORD_COUNT; i++) if (strcmp(KeyWordList[i], p) == 0) break; + + /* If we didn't find anything, i will be KEYWORD_COUNT, which is invalid */ + return i; +} + +BOOLEAN +NextLine(PCHAR LineBuffer, + ULONG BufferSize, + FILE *File) +{ + PCHAR p, pp; + + /* Scan each line */ + while (fgets(LineBuffer, BufferSize, File)) + { + /* Remember it */ + gLineCount++; + + /* Reset the pointer at the beginning of the line */ + p = LineBuffer; + + /* Now bypass all whitespace (and tabspace) */ + while ((*p) && ((*p == ' ') || (*p == '\t'))) p++; + + /* If this is an old-style comment, skip the line */ + if (*p == ';') continue; + + /* Otherwise, check for new-style comment */ + pp = strstr(p, "//"); + if (pp) + { + /* We have a comment, so terminate there (unless the whole line is one) */ + if (pp == p) continue; + *pp = '\0'; + } + else + { + /* No comment, so find the new line and terminate there */ + p = strchr(p, '\n'); + if (p) *p = '\0'; + } + + /* We have a line! */ + return TRUE; + } + + /* No line found */ + return FALSE; +} + +ULONG +SkipLines(VOID) +{ + ULONG KeyWord; + CHAR KeyWordChars[32]; + + /* Scan each line, skipping it if it's not a keyword */ + while (NextLine(gBuf, sizeof(gBuf), gfpInput)) + { + /* Read a single word */ + if (sscanf(gBuf, "%s", KeyWordChars) == 1) + { + /* If the word is a keyword, stop skipping lines */ + KeyWord = isKeyWord(KeyWordChars); + if (KeyWord < KEYWORD_COUNT) return KeyWord; + } + } + + /* We skipped all the possible lines, not finding anything */ + return KEYWORD_COUNT; +} + +VOID +DoParsing(VOID) +{ + ULONG KeyWords[KEYWORD_COUNT]; + ULONG KeyWord; + + /* Parse keywords */ + gLineCount = 0; + KeyWord = SkipLines(); + if (KeyWord >= KEYWORD_COUNT) + { + /* Invalid keyword count, fail */ + fclose(gfpInput); + printf("No keywords were found in '%s'.\n", gpszFileName); + exit(1); + } + + /* Now parse the keywords */ + while (KeyWord < (KEYWORD_COUNT - 1)) + { + /* Save this keyword */ + KeyWords[KeyWord]++; + + /* Check for duplicate entires, other than DEADKEY, which is okay */ + if ((KeyWord != 9) && (KeyWords[KeyWord] > 1) && (Verbose)) + { + /* On a verbose run, warn the user */ + printf("The '%s' keyword appeared multiple times.\n", + KeyWordList[KeyWord]); + } + + /* Now parse this keyword */ + switch (KeyWord) + { + /* KBD */ + case 0: + + printf("Found KBD section\n"); + KeyWord = SkipLines(); + break; + + /* VERSION */ + case 1: + + printf("Found VERSION section\n"); + KeyWord = SkipLines(); + break; + + /* COPYRIGHT */ + case 2: + + printf("Found COPYRIGHT section\n"); + KeyWord = SkipLines(); + break; + + /* COMPANY */ + case 3: + + printf("Found COMPANY section\n"); + KeyWord = SkipLines(); + break; + + /* LOCALENAME */ + case 4: + + printf("Found LOCALENAME section\n"); + KeyWord = SkipLines(); + break; + + /* MODIFIERS */ + case 5: + + printf("Found MODIFIERS section\n"); + KeyWord = SkipLines(); + break; + + /* SHIFTSTATE */ + case 6: + + printf("Found SHIFTSTATE section\n"); + KeyWord = SkipLines(); + break; + + /* ATTRIBUTES */ + case 7: + + printf("Found ATTRIBUTES section\n"); + KeyWord = SkipLines(); + break; + + /* LAYOUT */ + case 8: + + printf("Found LAYOUT section\n"); + KeyWord = SkipLines(); + break; + + /* DEADKEY */ + case 9: + + printf("Found DEADKEY section\n"); + KeyWord = SkipLines(); + break; + + /* LIGATURE */ + case 10: + + printf("Found LIGATURE section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME */ + case 11: + + printf("Found KEYNAME section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME_EXT */ + case 12: + + printf("Found KEYNAME_EXT section\n"); + KeyWord = SkipLines(); + break; + + /* KEYNAME_DEAD */ + case 13: + + printf("Found KEYNAME_DEAD section\n"); + KeyWord = SkipLines(); + break; + + /* DESCRIPTIONS */ + case 14: + + printf("Found DESCRIPTIONS section\n"); + KeyWord = SkipLines(); + break; + + /* LANGUAGENAMES */ + case 15: + + printf("Found LANGUAGENAMES section\n"); + KeyWord = SkipLines(); + break; + + /* ENDKBD */ + case 16: + + printf("Found ENDKBD section\n"); + KeyWord = SkipLines(); + break; + + + default: + break; + } + } +} /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs