Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[akhaldi] 53231: * Include NDK headers on-demand.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 12:59:05 2011 New Revision: 53231 URL: http://svn.reactos.org/svn/reactos?rev=53231&view=rev Log: * Include NDK headers on-demand. Modified: trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/smss.h trunk/reactos/dll/directx/ksuser/ksuser.h trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/win32/aclui/precomp.h trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/fmifs/precomp.h trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -7,7 +7,10 @@ #include <windows.h> #include <netevent.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obtypes.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <services/services.h> Modified: trunk/reactos/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.h?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -6,7 +6,16 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> #include <sm/api.h> #include <sm/helper.h> Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -4,7 +4,10 @@ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> +//#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obtypes.h> +#include <ndk/rtlfuncs.h> #include <ks.h> Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -24,7 +24,19 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdtypes.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> /* Internal NTDLL */ #include "ntdllp.h" Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -1,8 +1,8 @@ +#define _ACLUI_ #define WIN32_NO_STATUS +#include <windows.h> #define NTOS_MODE_USER -#define _ACLUI_ -#include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <commctrl.h> #include <oleauto.h> #include <objsel.h> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -41,9 +41,11 @@ #define CONTINUOUS_NOTES #define WIN32_NO_STATUS +#include <windows.h> #define NTOS_MODE_USER -#include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <stdio.h> #include <ntddbeep.h> #include <math.h> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/pr… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -15,7 +15,7 @@ #include <windows.h> #include <winerror.h> #include <windns.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> /* Internal DNSAPI Headers */ #include <internal/windns.h> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -1,10 +1,4 @@ -/* Can't use precomp.h because these weren't stubbed properly */ -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#include <windows.h> -#include <windns.h> -#include <ndk/ntndk.h> - +#include "precomp.h" #include <debug.h> DNS_STATUS WINAPI Modified: trunk/reactos/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/precomp.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -15,9 +15,13 @@ #define UNICODE #define _UNICODE +#include <stdio.h> + /* PSDK/NDK Headers */ #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> /* FMIFS Public Header */ #include <fmifs/fmifs.h> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -4,6 +4,7 @@ #define NtCurrentTeb NtXCurrentTeb #include <stdarg.h> +#include <stdio.h> #include <stdlib.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H @@ -24,7 +25,9 @@ #include <ws2tcpip.h> #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <nspapi.h> #include <iptypes.h> #include "iphlpapi.h" Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Sun Aug 14 12:59:05 2011 @@ -20,7 +20,20 @@ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdtypes.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/pofuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/umfuncs.h> /* CSRSS Header */ #include <csrss/csrss.h>

13 years, 3 months

[akhaldi] 53230: [AUTOCHK][CMD][TASKMGR] * Exclude some indirectly included headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 12:56:59 2011 New Revision: 53230 URL: http://svn.reactos.org/svn/reactos?rev=53230&view=rev Log: [AUTOCHK][CMD][TASKMGR] * Exclude some indirectly included headers. Modified: trunk/reactos/base/applications/taskmgr/precomp.h trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -13,7 +13,6 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/extypes.h> #include <ndk/exfuncs.h> #include <aclapi.h> #include <commctrl.h> Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -26,7 +26,6 @@ #include <assert.h> #define NTOS_MODE_USER -#include <ndk/pstypes.h> #include <ndk/rtlfuncs.h> #include "resource.h" Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Aug 14 12:56:59 2011 @@ -15,9 +15,7 @@ #define NTOS_MODE_USER #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> -#include <ndk/obtypes.h> #include <ndk/obfuncs.h> -#include <ndk/pstypes.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/umfuncs.h>

13 years, 3 months

[akhaldi] 53229: [GDI32] * Include NDK headers on-demand. * Improve the PCH use.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 12:32:15 2011 New Revision: 53229 URL: http://svn.reactos.org/svn/reactos?rev=53229&view=rev Log: [GDI32] * Include NDK headers on-demand. * Improve the PCH use. Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/historic.c Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] Sun Aug 14 12:32:15 2011 @@ -12,9 +12,11 @@ #define WIN32_NO_STATUS #define NTOS_MODE_USER +#include <stdio.h> + /* SDK/DDK/NDK Headers. */ #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <wingdi.h> #include <winddi.h> #include <d3dnthal.h> @@ -23,6 +25,12 @@ #include <winspool.h> #include <pseh/pseh2.h> + +#include <ddraw.h> +#include <ddrawi.h> +#include <ddrawint.h> +#include <ddrawgdi.h> +#include <d3dhal.h> /* Public Win32K Headers */ #include <win32k/ntgdityp.h> Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Sun Aug 14 12:32:15 2011 @@ -10,12 +10,6 @@ /* INCLUDES ******************************************************************/ #include "precomp.h" -#include <ddraw.h> -#include <ddrawi.h> -#include <ddrawint.h> -#include <ddrawgdi.h> -#include <ntgdi.h> -#include <d3dhal.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c [iso-8859-1] Sun Aug 14 12:32:15 2011 @@ -9,12 +9,6 @@ */ #include "precomp.h" -#include <ddraw.h> -#include <ddrawi.h> -#include <ddrawint.h> -#include <ddrawgdi.h> -#include <ntgdi.h> -#include <d3dhal.h> /* * @implemented

13 years, 3 months

[akhaldi] 53228: [DHCPCSVC] * Include NDK headers on-demand. * Improve the PCH use.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 12:06:23 2011 New Revision: 53228 URL: http://svn.reactos.org/svn/reactos?rev=53228&view=rev Log: [DHCPCSVC] * Include NDK headers on-demand. * Improve the PCH use. Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/compat.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/options.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/al… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -41,7 +41,6 @@ */ #include "rosdhcp.h" -#include "dhcpd.h" struct string_list * new_string_list(size_t size) Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ap… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -8,8 +8,6 @@ */ #include "rosdhcp.h" -#include <winsock2.h> -#include <iphlpapi.h> #define NDEBUG #include <reactos/debug.h> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/co… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/compat.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -1,6 +1,4 @@ #include "rosdhcp.h" -#include "dhcpd.h" -#include "stdint.h" size_t strlcpy(char *d, const char *s, size_t bufsize) { Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -54,7 +54,6 @@ */ #include "rosdhcp.h" -#include "dhcpd.h" #define PERIOD 0x2e #define hyphenchar(c) ((c) == 0x2d) Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/di… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -40,7 +40,7 @@ */ #include "rosdhcp.h" -#include "dhcpd.h" + //#include <sys/ioctl.h> //#include <net/if_media.h> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/op… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/options.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -40,12 +40,8 @@ * Enterprises, see ``http://www.vix.com''. */ -#include <ctype.h> -#include <string.h> - #define DHCP_OPTION_DATA #include "rosdhcp.h" -#include "dhcpd.h" int bad_options = 0; int bad_options_max = 5; Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ut… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/util.c [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -1,4 +1,3 @@ -#include <stdarg.h> #include "rosdhcp.h" #define NDEBUG Modified: trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/include… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] Sun Aug 14 12:06:23 2011 @@ -4,7 +4,7 @@ #define WIN32_NO_STATUS #include <winsock2.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h> #include <iprtrmib.h> #include <iphlpapi.h> #include <dhcpcsdk.h>

13 years, 3 months

[akhaldi] 53227: [DBGHELP] * Reduce rosstubs.c dependency to nothing but the PCH.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 11:48:00 2011 New Revision: 53227 URL: http://svn.reactos.org/svn/reactos?rev=53227&view=rev Log: [DBGHELP] * Reduce rosstubs.c dependency to nothing but the PCH. Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/rosstubs… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] Sun Aug 14 11:48:00 2011 @@ -18,12 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ndk/ntndk.h> - #include "dbghelp_private.h" +ULONG __cdecl DbgPrint(IN PCCH Format, IN ...); #define UNIMPLEMENTED DbgPrint("DBGHELP: %s is unimplemented, please try again later.\n", __FUNCTION__); #define PDBGHELP_CREATE_USER_DUMP_CALLBACK PVOID

13 years, 3 months

[ekohl] 53226: [ADVAPI32] Fix indentation. No code change.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 14 11:41:28 2011 New Revision: 53226 URL: http://svn.reactos.org/svn/reactos?rev=53226&view=rev Log: [ADVAPI32] Fix indentation. No code change. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Aug 14 11:41:28 2011 @@ -2543,7 +2543,7 @@ if (KeyInfo->Node.NameLength > NameLength || KeyInfo->Node.ClassLength > ClassLength) { - ErrorCode = ERROR_BUFFER_OVERFLOW; + ErrorCode = ERROR_BUFFER_OVERFLOW; } else {

13 years, 3 months

[akhaldi] 53225: [ADVAPI32] * Use consistent debugging macros (Wine's). * Include NDK headers on-demand. * Improve the PCH.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 14 11:31:23 2011 New Revision: 53225 URL: http://svn.reactos.org/svn/reactos?rev=53225&view=rev Log: [ADVAPI32] * Use consistent debugging macros (Wine's). * Include NDK headers on-demand. * Improve the PCH. Modified: trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c trunk/reactos/dll/win32/advapi32/misc/dllmain.c trunk/reactos/dll/win32/advapi32/misc/efs.c trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/misc/msi.c trunk/reactos/dll/win32/advapi32/misc/shutdown.c trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/dll/win32/advapi32/misc/trace.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/cred.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -25,7 +25,14 @@ #include <winsafer.h> #include <sddl.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> @@ -34,6 +41,13 @@ #include "svcctl_c.h" #include "lsa_c.h" #include "eventlogrpc_c.h" + +#include <rpc.h> + +#include "crypt/crypt.h" +#include <wine/debug.h> +#include <wine/unicode.h> +#include <wincred.h> #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -25,10 +25,6 @@ */ #include <advapi32.h> -#include "crypt.h" - -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -20,9 +20,6 @@ /* http://cryptopp.sourceforge.net/docs/ref521/arc4_8cpp-source.html */ #include <advapi32.h> - -#include "crypt.h" - void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen) { Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_des.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -22,7 +22,6 @@ */ #include <advapi32.h> -#include "crypt.h" static const unsigned char InitialPermuteMap[64] = { Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -21,8 +21,6 @@ */ #include <advapi32.h> -#include "crypt.h" - static const unsigned char CRYPT_LMhash_Magic[8] = { 'K', 'G', 'S', '!', '@', '#', '$', '%' }; Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -34,8 +34,6 @@ */ #include <advapi32.h> -#include "crypt.h" - /* The three core functions */ Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -34,8 +34,6 @@ */ #include <advapi32.h> -#include "crypt.h" - typedef struct { Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_sha.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -18,7 +18,6 @@ */ #include <advapi32.h> -#include "crypt.h" /* SHA Context Structure Declaration */ Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -10,8 +10,7 @@ */ #include <advapi32.h> -#define NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); extern BOOL RegInitialize(VOID); extern BOOL RegCleanup(VOID); Modified: trunk/reactos/dll/win32/advapi32/misc/efs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ef… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/efs.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -7,8 +7,6 @@ */ #include <advapi32.h> -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/hw… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -8,8 +8,6 @@ */ #include <advapi32.h> -#include <rpc.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -7,8 +7,6 @@ */ #include <advapi32.h> - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/misc/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/ms… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/msi.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -9,7 +9,6 @@ #include <advapi32.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); #ifndef _UNICODE #define debugstr_aw debugstr_a Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -11,7 +11,7 @@ */ #include <advapi32.h> -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); #define USZ {0,0,0} Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -12,7 +12,6 @@ */ #include <advapi32.h> -#include <crypt/crypt.h> static const unsigned char CRYPT_LMhash_Magic[8] = { 'K', 'G', 'S', '!', '@', '#', '$', '%' }; Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -3,10 +3,6 @@ */ #include <advapi32.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* * @unimplemented Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -14,8 +14,6 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(reg); /* DEFINES ******************************************************************/ Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -7,8 +7,6 @@ */ #include <advapi32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* --- ACL --- */ Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -12,8 +12,6 @@ /* INCLUDES *****************************************************************/ #include <advapi32.h> -#include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <time.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincred.h" -#include "winternl.h" -#include "../crypt/crypt.h" - -#include "wine/unicode.h" -#include "wine/debug.h" - +#include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(cred); /* the size of the ARC4 key used to encrypt the password data */ Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -11,9 +11,6 @@ * */ #include <advapi32.h> -#include "wine/debug.h" -#include "wine/unicode.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -11,9 +11,6 @@ */ #include <advapi32.h> -#include "wine/unicode.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -12,8 +12,6 @@ */ #include <advapi32.h> -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); /* Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -12,10 +12,6 @@ */ #include <advapi32.h> -#include <sddl.h> -#include <wine/debug.h> -#include <wine/unicode.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); #define MAX_GUID_STRING_LEN 39 Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -7,9 +7,6 @@ */ #include <advapi32.h> - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -22,8 +22,6 @@ */ #include <advapi32.h> -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); static RPC_UNICODE_STRING EmptyStringU = { 0, 0, L"" }; Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -13,9 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -13,8 +13,6 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sun Aug 14 11:31:23 2011 @@ -9,8 +9,6 @@ */ #include <advapi32.h> -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(advapi); /*

13 years, 3 months

[gadamopoulos] 53224: [uxtheme] - Unfortunately ExtCreateRegion does not seem to work, so for the time being use a simpler (and slower) implementation of UXTHEME_RegionFromDibBits that uses multipl...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 14 10:52:13 2011 New Revision: 53224 URL: http://svn.reactos.org/svn/reactos?rev=53224&view=rev Log: [uxtheme] - Unfortunately ExtCreateRegion does not seem to work, so for the time being use a simpler (and slower) implementation of UXTHEME_RegionFromDibBits that uses multiple calls to CombineRgn Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] Sun Aug 14 10:52:13 2011 @@ -1771,8 +1771,12 @@ { int x, y, xstart; int cMaxRgnRects, cRgnDataSize, cRgnRects; +#ifdef EXTCREATEREGION_WORKS RECT* prcCurrent; PRGNDATA prgnData; +#else + HRGN hrgnTemp; +#endif ULONG clrTransparent, *pclrCurrent; HRGN hrgnRet; @@ -1784,10 +1788,14 @@ cMaxRgnRects = 4* (pRect->bottom-pRect->top); cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT); +#ifdef EXTCREATEREGION_WORKS /* Allocate the region data */ prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize); prcCurrent = (PRECT)prgnData->Buffer; +#else + hrgnRet = CreateRectRgn(0,0,0,0); +#endif /* Calculate the region rects */ y=0; @@ -1811,6 +1819,7 @@ pclrCurrent++; } +#ifdef EXTCREATEREGION_WORKS /* Add the scaned line to the region */ SetRect(prcCurrent, xstart, y,x,y+1); prcCurrent++; @@ -1827,6 +1836,11 @@ cRgnDataSize); prcCurrent = (RECT*)prgnData->Buffer + cRgnRects; } +#else + hrgnTemp = CreateRectRgn(xstart, y,x,y+1); + CombineRgn(hrgnRet, hrgnRet, hrgnTemp, RGN_OR ); + DeleteObject(hrgnTemp); +#endif } else { @@ -1837,6 +1851,7 @@ y++; } +#ifdef EXTCREATEREGION_WORKS /* Fill the region data header */ prgnData->rdh.dwSize = sizeof(prgnData->rdh); prgnData->rdh.iType = RDH_RECTANGLES; @@ -1849,6 +1864,7 @@ /* Free the region data*/ HeapFree(GetProcessHeap(),0,prgnData); +#endif /* return the region*/ return hrgnRet;

13 years, 3 months

[gadamopoulos] 53223: [undocuser.h] - Improve definition of USERAPIHOOK

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 14 10:45:50 2011 New Revision: 53223 URL: http://svn.reactos.org/svn/reactos?rev=53223&view=rev Log: [undocuser.h] - Improve definition of USERAPIHOOK Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] Sun Aug 14 10:45:50 2011 @@ -122,6 +122,7 @@ // typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); +typedef int (WINAPI *SETWINDOWRGN)(HWND hWnd, HRGN hRgn, BOOL bRedraw); typedef struct _UAHOWP { @@ -143,7 +144,7 @@ FARPROC SetScrollInfo; FARPROC EnableScrollBar; FARPROC AdjustWindowRectEx; - FARPROC SetWindowRgn; + SETWINDOWRGN SetWindowRgn; WNDPROC_OWP PreWndProc; WNDPROC_OWP PostWndProc; UAHOWP WndProcArray;

13 years, 3 months

[gadamopoulos] 53222: [win32k] - Disable some debug prints that are not needed any more

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 14 10:28:49 2011 New Revision: 53222 URL: http://svn.reactos.org/svn/reactos?rev=53222&view=rev Log: [win32k] - Disable some debug prints that are not needed any more Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/input.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/timer.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Aug 14 10:28:49 2011 @@ -1645,7 +1645,6 @@ IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); // Get windows thread message points. point = pWnd->head.pti->ptLast; - DPRINT1("point: %d, %d\n", point.x, point.y); // Set desktop mouse hover from the system default hover rectangle. RECTL_vSetRect(&pDesk->rcMouseHover, point.x - gspv.iMouseHoverWidth / 2, Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Aug 14 10:28:49 2011 @@ -549,7 +549,7 @@ { MSG msgMouseLeave; - DPRINT1("co_MsqInsertMouseMessage: generating WM_MOUSELEAVE\n"); + DPRINT("co_MsqInsertMouseMessage: generating WM_MOUSELEAVE\n"); msgMouseLeave.hwnd = UserHMGetHandle(pDesk->spwndTrack); msgMouseLeave.message = WM_MOUSELEAVE; @@ -1393,7 +1393,7 @@ { MSG msgMouseLeave; - DPRINT1("co_IntProcessMouseMessage: generating WM_MOUSELEAVE\n"); + DPRINT("co_IntProcessMouseMessage: generating WM_MOUSELEAVE\n"); msgMouseLeave.hwnd = UserHMGetHandle(pDesk->spwndTrack); msgMouseLeave.message = WM_MOUSELEAVE; Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sun Aug 14 10:28:49 2011 @@ -326,7 +326,6 @@ pWnd == pDesk->spwndTrack ) { Point = pWnd->head.pti->MessageQueue->MouseMoveMsg.pt; - DPRINT1("point: %d, %d\n", Point.x, Point.y); if ( IntPtInRect(&pDesk->rcMouseHover, Point) ) { if (pDesk->htEx == HTCLIENT) // In a client area. @@ -347,7 +346,7 @@ wParam = pDesk->htEx; // Need to support all HTXYZ hits. Msg = WM_NCMOUSEHOVER; } - DPRINT1("Generating WM_NCMOUSEHOVER\n"); + DPRINT("Generating WM_NCMOUSEHOVER\n"); UserPostMessage(hwnd, Msg, wParam, MAKELPARAM(Point.x, Point.y)); pDesk->dwDTFlags &= ~DF_TME_HOVER; break; // Kill this timer.

13 years, 3 months

← Newer
1
...
26
27
28
29
30
31
32
...
50
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 2011