Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 48477: [KERNEL32]: Aleksey wants debug channels, I agree this is the way forward. Leverage existing NT infrastructure to enable Windows-compatible debug channel support, instead of using a UNIX-based 3rd party library. Same debug channel names as before have been re-added, but using NT Debug Filters.
by sir_richard＠svn.reactos.org 07 Aug '10

07 Aug '10

Author: sir_richard Date: Sat Aug 7 16:01:30 2010 New Revision: 48477 URL: http://svn.reactos.org/svn/reactos?rev=48477&view=rev Log: [KERNEL32]: Aleksey wants debug channels, I agree this is the way forward. Leverage existing NT infrastructure to enable Windows-compatible debug channel support, instead of using a UNIX-based 3rd party library. Same debug channel names as before have been re-added, but using NT Debug Filters. Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/delete.c trunk/reactos/dll/win32/kernel32/file/deviceio.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/file/hardlink.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/misc/version.c trunk/reactos/dll/win32/kernel32/process/session.c trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -15,6 +15,8 @@ #include <k32.h> #define NDEBUG #include <debug.h> + +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -15,6 +15,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -17,6 +17,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; #define SYMLINK_FLAG_RELATIVE 1 Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -19,6 +19,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* GLOBAL VARIABLES **********************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -14,6 +14,7 @@ #include <k32.h> #define NDEBUG #include <reactos/debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -10,7 +10,7 @@ #include <k32.h> #define NDEBUG -#include <reactos/debug.h> +#include <debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -18,6 +18,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; UNICODE_STRING DllDirectory = {0, 0, NULL}; Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -14,6 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -15,6 +15,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -14,6 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* TYPES ********************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ha… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -14,6 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -16,6 +16,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -13,6 +13,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -19,6 +19,7 @@ #include <malloc.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -12,6 +12,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; //#define USING_PROPER_NPFS_WAIT_SEMANTICS Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -13,6 +13,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* GLOBALS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -14,6 +14,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -22,6 +22,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32file; #define MAX_DOS_DRIVES 26 Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -1,9 +1,19 @@ #pragma once -#define TRACE DPRINT -#define WARN DPRINT1 -#define FIXME DPRINT1 -#define ERR DPRINT1 +// +// Kernel32 Filter IDs +// +#define kernel32file 200 +#define kernel32ver 201 +#define actctx 202 +#define resource 203 +#define kernel32session 204 + +#define TRACE(fmt, ...) TRACE__(gDebugChannel, fmt, ##__VA_ARGS__) +#define WARN(fmt, ...) WARN__(gDebugChannel, fmt, ##__VA_ARGS__) +#define FIXME(fmt, ...) WARN__(gDebugChannel, fmt,## __VA_ARGS__) +#define ERR(fmt, ...) ERR__(gDebugChannel, fmt, ##__VA_ARGS__) + #define debugstr_a #define debugstr_w #define wine_dbgstr_w Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -15,6 +15,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = actctx; #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -22,6 +22,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = resource; struct format_args { Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -32,6 +32,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = resource; #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ #define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */ Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/version.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -11,6 +11,7 @@ #include <reactos/buildno.h> #define NDEBUG #include <debug.h> +static ULONG gDebugChannel = kernel32ver; #define UNICODIZE1(x) L##x #define UNICODIZE(x) UNICODIZE1(x) Modified: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/session.c [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -11,6 +11,7 @@ #include <k32.h> #define NDEBUG #include <debug.h> +//static ULONG gDebugChannel = kernel32session; not actually used DWORD ActiveConsoleSessionId = 0; Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sat Aug 7 16:01:30 2010 @@ -107,6 +107,11 @@ #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + + #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #else /* not DBG */ /* On non-debug builds, we never show these */ @@ -119,6 +124,11 @@ #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + + #define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define INFO__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif /* not DBG */ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x))

1 0

[fireball] 48476: [KERNEL32] - That's what happens when most of the commit's changes are not related to most of the commit message. Fixes build.
by fireball＠svn.reactos.org 07 Aug '10

07 Aug '10

Author: fireball Date: Sat Aug 7 09:10:06 2010 New Revision: 48476 URL: http://svn.reactos.org/svn/reactos?rev=48476&view=rev Log: [KERNEL32] - That's what happens when most of the commit's changes are not related to most of the commit message. Fixes build. Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Sat Aug 7 09:10:06 2010 @@ -9,7 +9,8 @@ /* INCLUDES *******************************************************************/ #include <k32.h> -#include <wine/debug.h> +#define NDEBUG +#include <reactos/debug.h> /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Sat Aug 7 09:10:06 2010 @@ -83,25 +83,6 @@ static const char hex[16] = "0123456789ABCDEF"; - -static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - for (end = ptr + n; ptr < end; ptr++) - if (*ptr == ch) - return (WCHAR *)(ULONG_PTR)ptr; - return NULL; -} - -static __inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) -{ - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) - if (*ptr == ch) - ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; -} /*********************************************************************** * PROFILE_CopyEntry

1 0

[sir_richard] 48475: [KERNEL32]: While working on the CMAKE branch, Amine and myself discovered a rather serious issue in kernel32 (and perhaps other libraries as well). Unlike rbuild, CMake does not allow you to export non-existant DLL functions (try it: add "poopyhead" in kernel32's exports under RBuild, and will it export "poopyhead", God knowing what that will actually link to). As an additional feature on top of the "allow non-existing functions to be exported" "feature", because rbuild gen
by sir_richard＠svn.reactos.org 07 Aug '10

07 Aug '10

Author: sir_richard Date: Sat Aug 7 05:02:58 2010 New Revision: 48475 URL: http://svn.reactos.org/svn/reactos?rev=48475&view=rev Log: [KERNEL32]: While working on the CMAKE branch, Amine and myself discovered a rather serious issue in kernel32 (and perhaps other libraries as well). Unlike rbuild, CMake does not allow you to export non-existant DLL functions (try it: add "poopyhead" in kernel32's exports under RBuild, and will it export "poopyhead", God knowing what that will actually link to). As an additional feature on top of the "allow non-existing functions to be exported" "feature", because rbuild generates and links STDCALL function names without the proper decoration (vs. enforcing decoration at linking, but only removing it at export-time), this allows the definition (as an export) of a STDCALL function that is completely different from the actual function itself. For example, the 5-parameter Foo function is normally Foo@20, while the 3-parameter Foo function woudl be Foo@12. Linking one against the other would fail (say, 2 parameters were added to Foo in a newer version). However, under RBUILD, both of these would appear as "Foo", and the linker/compiler would happilly connect the caller of Foo@3 (that has pushed 3 parameters) to the receiving side of Foo@5 (that is about to pop 5 parameters). Even -if- decorations WERE to be applied, Foo@12 would STILL succeed, because of the first feature, which would enable the export of Foo@12 even though no such function exist. In a further, bizare, twist of fate, the behavior of this RBUILD "feature", when the target function is not found, is to link the exported DLL TO ITSELF. Therefore, one can see how, previously to this patch, kernel32.dll would import a dozen functions from itself (all the non-existing functions). To really seal the deal, the behavior of exported functions used by kernel32, but that are actually forwarded to another DLL deserves a special mention. GetLastError, for example, merely forwards to RtlGetLastWin32Error, so it is normal behavior to use a #define in the C code so that all internal calls to the function are routed correctly. This did not happen, so instead, kernel32 tried importing/linking/exporting GetLastError, but this symbol is not found in the binary, because it is only a forwarder. This caused kernel32 to import from itself (the behavior when an exported symbol is not found). When importing from itself, the loader would now find the _forwarded_ for GetLastError, and correctly link with ntdll. What should be a one-liner of assembly (inline TEB access) thus became a triple-call indirection (GetLastError@0->StubLastError@0->__impGetLastError@0->__impRtlGetLastWin32Error->RtlGetLastWin32Error. While analyzing these issues, we also realized a strange macro SetLastErrorByStatus that manually tried to perform what there already exists a function for: RtlSetLastNtStatusFromWin32Error. And, in an exciting coda, we also realized that our Server 2003 Kernel32 exports more than a dozen Windows 95 APIs, through an auto-stub generation mechanism within winebuild, that gets linked as an object behind the scenes. [KERNEL32]: Removed all Win95 exports, cleaned up exports. [KERNEL32]: Fixed up set/get error macros by making them inline and/or calling the correct ntdll function. [KERNEL32]: Removed bizare calls to Wine-internal/specific APIs from our core Win32 DLL. [KERNEL32]: Wrote stubs for all functions which should be exported, and set the correct number of parameters for them. [KERNEL32]: Kernel32 is smaller, loads faster, does not export Windows 95 functions, does not export non-existing functions, and does not import from itself anymore. Note: This is one of the many failings of RBUILD the CMAKE system has helped us discover. I believe these issues are serious enough to warrant an immediate sync with trunk, but rest assured, there are many more completely broken, infinitely-regressing things that we discovered while switching to CMAKE. Added: trunk/reactos/dll/win32/kernel32/kernel32.def - copied, changed from r48474, trunk/reactos/dll/win32/kernel32/kernel32.pspec Removed: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/file/backup.c trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/cnotify.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/delete.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/dosdev.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/find.c trunk/reactos/dll/win32/kernel32/file/hardlink.c trunk/reactos/dll/win32/kernel32/file/iocompl.c trunk/reactos/dll/win32/kernel32/file/lfile.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/move.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/pipe.c trunk/reactos/dll/win32/kernel32/file/rw.c trunk/reactos/dll/win32/kernel32/file/tape.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/version.c trunk/reactos/dll/win32/kernel32/process/session.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ba… Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… Modified: trunk/reactos/dll/win32/kernel32/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/de… Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/do… Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ha… Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lf… Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pi… Modified: trunk/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw… Modified: trunk/reactos/dll/win32/kernel32/file/tape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ta… Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… Copied: trunk/reactos/dll/win32/kernel32/kernel32.def (from r48474, trunk/reactos/dll/win32/kernel32/kernel32.pspec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Removed: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… Modified: trunk/reactos/dll/win32/kernel32/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ve… Modified: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process…

1 0

[cgutman] 48474: [IPHLPAPI] - Comment out the GetAdaptersAddresses code and add the stub back - Fixes Firefox 3.x (bug 5399)
by cgutman＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: cgutman Date: Fri Aug 6 23:01:10 2010 New Revision: 48474 URL: http://svn.reactos.org/svn/reactos?rev=48474&view=rev Log: [IPHLPAPI] - Comment out the GetAdaptersAddresses code and add the stub back - Fixes Firefox 3.x (bug 5399) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Aug 6 23:01:10 2010 @@ -2291,6 +2291,7 @@ */ DWORD WINAPI GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) { +#if 0 InterfaceIndexTable *indexTable; IFInfo ifInfo; int i; @@ -2477,6 +2478,15 @@ free(indexTable); return NO_ERROR; +#else + if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + if (!pAdapterAddresses || *pOutBufLen == 0) + return ERROR_BUFFER_OVERFLOW; + if (Reserved) return ERROR_INVALID_PARAMETER; + + FIXME(":stub\n"); + return ERROR_NO_DATA; +#endif } /*

1 0

[tkreuzer] 48473: [CRT] - Remove "implementations" of __lc_collate_cp, __lc_handle and __lc_codepage. These are not functions, but varuables, implemented as MSVCRT_* - add ___lc_codepage_func and ___lc_handle_func taken from wine - Fix msvcrt spec file - Fixes compilation with gcc 4.5.1
by tkreuzer＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: tkreuzer Date: Fri Aug 6 22:42:07 2010 New Revision: 48473 URL: http://svn.reactos.org/svn/reactos?rev=48473&view=rev Log: [CRT] - Remove "implementations" of __lc_collate_cp, __lc_handle and __lc_codepage. These are not functions, but varuables, implemented as MSVCRT_* - add ___lc_codepage_func and ___lc_handle_func taken from wine - Fix msvcrt spec file - Fixes compilation with gcc 4.5.1 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri Aug 6 22:42:07 2010 @@ -126,9 +126,9 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) -# @ cdecl ___lc_codepage_func() +@ cdecl ___lc_codepage_func() # @ cdecl ___lc_collate_cp_func() -# @ cdecl ___lc_handle_func() +@ cdecl ___lc_handle_func() # @ cdecl ___mb_cur_max_func() MSVCRT___mb_cur_max_func @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -151,10 +151,10 @@ @ cdecl __isascii(long) __isascii @ cdecl __iscsym(long) __iscsym @ cdecl __iscsymf(long) __iscsymf -@ extern __lc_codepage __lc_codepage +@ extern __lc_codepage MSVCRT___lc_codepage @ stub __lc_collate -@ extern __lc_collate_cp __lc_collate_cp -@ extern __lc_handle __lc_handle +@ extern __lc_collate_cp MSVCRT___lc_collate_cp +@ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() # stub __libm_sse2_acos # stub __libm_sse2_acosf Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Fri Aug 6 22:42:07 2010 @@ -755,38 +755,20 @@ /********************************************************************* - * __lc_collate_cp (MSVCRT.@) - * - * @unimplemented - */ -void __lc_collate_cp(int cp) -{ -FIXME("__lc_collate_cp - stub\n"); -return; -} - - -/********************************************************************* - * __lc_handle (MSVCRT.@) - * - * @unimplemented - */ -void __lc_handle(void) -{ -FIXME("__lc_handle - stub\n"); -return; -} - - -/********************************************************************* - * __lc_codepage (MSVCRT.@) - * - * @unimplemented - */ -void __lc_codepage(void) -{ -FIXME("__lc_codepage - stub\n"); -return; + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; }

1 0

[jgardou] 48472: revert xlate.c from 48471, never meant to be committed. Sorry.
by jgardou＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: jgardou Date: Fri Aug 6 22:09:38 2010 New Revision: 48472 URL: http://svn.reactos.org/svn/reactos?rev=48472&view=rev Log: revert xlate.c from 48471, never meant to be committed. Sorry. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Aug 6 22:09:38 2010 @@ -83,45 +83,66 @@ { ULONG iNewColor; - /* Copy blue */ - iColor >>= 3; - iNewColor = iColor & 0x1F; - - /* Copy green */ - iColor >>= 3; - iNewColor |= iColor & 0x3E0; - - /* Copy red */ - iColor >>= 3; - iNewColor |= iColor & 0x7C00; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - /* Copy red */ iColor <<= 7; iNewColor = iColor & 0x7C00; /* Copy green */ iColor >>= 13; + iNewColor |= iColor & 0x3E0; + + /* Copy green */ + iColor >>= 13; + iNewColor |= iColor & 0x1F; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy blue */ + iColor >>= 3; + iNewColor = iColor & 0x1f; + + /* Copy green */ + iColor >>= 3; iNewColor |= (iColor & 0x3E0); - /* Copy blue */ + /* Copy red */ + iColor >>= 3; + iNewColor |= (iColor & 0x7C00); + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy red */ + iColor <<= 8; + iNewColor = iColor & 0xF800; + + /* Copy green */ iColor >>= 13; - iNewColor |= (iColor & 0x1F); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) + iNewColor |= iColor & 0x7E0; + + /* Copy green */ + iColor >>= 14; + iNewColor |= iColor & 0x1F; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -142,35 +163,34 @@ ULONG FASTCALL -EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; +EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) +{ + return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy blue */ + iNewColor = gajXlate5to8[iColor & 0x1F] << 16; + + /* Copy green */ + iColor >>= 5; + iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; /* Copy red */ - iColor <<= 8; - iNewColor = iColor & 0xF800; - - /* Copy green */ - iColor >>= 13; - iNewColor |= iColor & 0x7E0; - - /* Copy green */ - iColor >>= 14; - iNewColor |= iColor & 0x1F; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) -{ - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) + iColor >>= 5; + iNewColor |= gajXlate5to8[iColor & 0x1F]; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -190,26 +210,6 @@ ULONG FASTCALL -EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F] << 16; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; - - /* Copy red */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F]; - - return iNewColor; -} - -ULONG -FASTCALL EXLATEOBJ_iXlate555to565(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -260,26 +260,6 @@ ULONG iNewColor; /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F]; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; - - /* Copy red */ - iColor >>= 6; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ iNewColor = gajXlate5to8[iColor & 0x1F] << 16; /* Copy green */ @@ -289,6 +269,26 @@ /* Copy red */ iColor >>= 6; iNewColor |= gajXlate5to8[iColor & 0x1F]; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy blue */ + iNewColor = gajXlate5to8[iColor & 0x1F]; + + /* Copy green */ + iColor >>= 5; + iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; + + /* Copy blue */ + iColor >>= 6; + iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; return iNewColor; }

1 0

[jgardou] 48471: [WIN32K] - sync with trunk (48469)
by jgardou＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: jgardou Date: Fri Aug 6 21:33:37 2010 New Revision: 48471 URL: http://svn.reactos.org/svn/reactos?rev=48471&view=rev Log: [WIN32K] - sync with trunk (48469) Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc (props changed) branches/reactos-yarotows/dll/win32/ole32/ole2.c branches/reactos-yarotows/dll/win32/oleaut32/oleaut32.spec branches/reactos-yarotows/dll/win32/oleaut32/typelib.c branches/reactos-yarotows/dll/win32/oleaut32/typelib2.c branches/reactos-yarotows/drivers/filesystems/cdfs/cdfs.h branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ (props changed) branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 6 21:33:37 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:45219-48463 +/trunk/reactos:45219-48470 Propchange: branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 6 21:33:37 2010 @@ -2,4 +2,4 @@ /branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc:46848,46966,47800 /branches/ros-amd64-bringup/dll/win32/jscript/jscript_Si.rc:36852 /branches/ros-amd64-bringup/reactos/dll/win32/jscript/jscript_Si.rc:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 -/trunk/reactos/dll/win32/jscript/jscript_Si.rc:47414-48463 +/trunk/reactos/dll/win32/jscript/jscript_Si.rc:47414-48470 Modified: branches/reactos-yarotows/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/ole3… ============================================================================== --- branches/reactos-yarotows/dll/win32/ole32/ole2.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/ole32/ole2.c [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -409,6 +409,7 @@ HRESULT hr; IStream *stream; HANDLE map; + IUnknown *unk; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -449,7 +450,15 @@ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); if(FAILED(hr)) return hr; - hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)pDropTarget, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + hr = IDropTarget_QueryInterface(pDropTarget, &IID_IUnknown, (void**)&unk); + if(FAILED(hr)) + { + IStream_Release(stream); + return hr; + } + hr = CoMarshalInterface(stream, &IID_IDropTarget, unk, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + IUnknown_Release(unk); + if(SUCCEEDED(hr)) { hr = create_map_from_stream(stream, &map); Modified: branches/reactos-yarotows/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/olea… ============================================================================== --- branches/reactos-yarotows/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -410,6 +410,8 @@ 439 stdcall VarUI8FromUI2(long ptr) 440 stdcall VarUI8FromUI4(long ptr) 441 stdcall VarUI8FromDec(long ptr) +442 stdcall RegisterTypeLibForUser(ptr wstr wstr) +443 stdcall UnRegisterTypeLibForUser(ptr long long long long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: branches/reactos-yarotows/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/olea… ============================================================================== --- branches/reactos-yarotows/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/oleaut32/typelib.c [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -901,6 +901,49 @@ if (subKey) RegCloseKey(subKey); if (key) RegCloseKey(key); return result; +} + +/****************************************************************************** + * RegisterTypeLibForUser [OLEAUT32.442] + * Adds information about a type library to the user registry + * NOTES + * Docs: ITypeLib FAR * ptlib + * Docs: OLECHAR FAR* szFullPath + * Docs: OLECHAR FAR* szHelpDir + * + * RETURNS + * Success: S_OK + * Failure: Status + */ +HRESULT WINAPI RegisterTypeLibForUser( + ITypeLib * ptlib, /* [in] Pointer to the library*/ + OLECHAR * szFullPath, /* [in] full Path of the library*/ + OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, + may be NULL*/ +{ + FIXME("(%p, %s, %s) registering the typelib system-wide\n", ptlib, + debugstr_w(szFullPath), debugstr_w(szHelpDir)); + return RegisterTypeLib(ptlib, szFullPath, szHelpDir); +} + +/****************************************************************************** + * UnRegisterTypeLibForUser [OLEAUT32.443] + * Removes information about a type library from the user registry + * + * RETURNS + * Success: S_OK + * Failure: Status + */ +HRESULT WINAPI UnRegisterTypeLibForUser( + REFGUID libid, /* [in] GUID of the library */ + WORD wVerMajor, /* [in] major version */ + WORD wVerMinor, /* [in] minor version */ + LCID lcid, /* [in] locale id */ + SYSKIND syskind) +{ + FIXME("(%s, %u, %u, %u, %u) unregistering the typelib system-wide\n", + debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind); + return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind); } /*======================= ITypeLib implementation =======================*/ @@ -6017,13 +6060,13 @@ unsigned int var_index; TYPEKIND type_kind; HRESULT hres; - const TLBFuncDesc *pFuncInfo = This->funclist; + const TLBFuncDesc *pFuncInfo; TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n", This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); - if( pFuncInfo->funcdesc.wFuncFlags == FUNCFLAG_FRESTRICTED ) + if( This->TypeAttr.wTypeFlags & TYPEFLAG_FRESTRICTED ) return DISP_E_MEMBERNOTFOUND; if (!pDispParams) @@ -6045,7 +6088,8 @@ * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) if ((memid == pFuncInfo->funcdesc.memid) && - (wFlags & pFuncInfo->funcdesc.invkind)) + (wFlags & pFuncInfo->funcdesc.invkind) && + (pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED) == 0) break; if (pFuncInfo) { Modified: branches/reactos-yarotows/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/olea… ============================================================================== --- branches/reactos-yarotows/dll/win32/oleaut32/typelib2.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/oleaut32/typelib2.c [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -317,7 +317,7 @@ while (offset != -1) { guidentry = (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][offset]; - if (!memcmp(guidentry, guid, sizeof(GUID))) return offset; + if (IsEqualGUID(guidentry, guid)) return offset; offset = guidentry->next_hash; } @@ -1695,7 +1695,7 @@ impinfo.oGuid = guid_offset; *phRefType = ctl2_alloc_importinfo(This->typelib, &impinfo)+1; - if(!memcmp(&guid.guid, &IID_IDispatch, sizeof(GUID))) + if(IsEqualGUID(&guid.guid, &IID_IDispatch)) This->typelib->typelib_header.dispatchpos = *phRefType; } @@ -2469,7 +2469,7 @@ return hres; } - if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) + if(IsEqualGUID(&typeattr->guid, &IID_IDispatch)) This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; This->typeinfo->datatype2 += (typeattr->cFuncs<<16) + 1; Modified: branches/reactos-yarotows/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… ============================================================================== --- branches/reactos-yarotows/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ branches/reactos-yarotows/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -142,7 +142,7 @@ ULONG JolietLevel; ULONG RootStart; ULONG RootSize; - WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH]; + WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; ULONG VolumeLabelLength; ULONG SerialNumber; } CDINFO, *PCDINFO; Modified: branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/filesy… ============================================================================== --- branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ branches/reactos-yarotows/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -73,11 +73,24 @@ /* Extract the volume label */ pc = Pvd->VolumeId; pw = CdInfo->VolumeLabel; - for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH && *pc != ' '; i++) + for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR); i++) { *pw++ = (WCHAR)*pc++; } *pw = 0; + + /* Trim trailing spaces */ + while (pw > CdInfo->VolumeLabel) + { + if (*--pw != ' ') break; + + /* Remove the space */ + *pw = '\0'; + + /* Decrease size */ + i--; + } + CdInfo->VolumeLabelLength = i * sizeof(WCHAR); CdInfo->VolumeSpaceSize = Pvd->VolumeSpaceSizeL; Propchange: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 6 21:33:37 2010 @@ -1,4 +1,4 @@ /branches/header-work/subsystems/win32/csrss/win32csr:45691-46463 /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46524,46526,46534-46535,46537-46539,46589 /branches/ros-amd64-bringup/subsystems/win32/csrss/win32csr:36852 -/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48463 +/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48470 Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Aug 6 21:33:37 2010 @@ -83,24 +83,45 @@ { ULONG iNewColor; + /* Copy blue */ + iColor >>= 3; + iNewColor = iColor & 0x1F; + + /* Copy green */ + iColor >>= 3; + iNewColor |= iColor & 0x3E0; + + /* Copy red */ + iColor >>= 3; + iNewColor |= iColor & 0x7C00; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) +{ + ULONG iNewColor; + /* Copy red */ iColor <<= 7; iNewColor = iColor & 0x7C00; /* Copy green */ iColor >>= 13; - iNewColor |= iColor & 0x3E0; - - /* Copy green */ + iNewColor |= (iColor & 0x3E0); + + /* Copy blue */ iColor >>= 13; - iNewColor |= iColor & 0x1F; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) + iNewColor |= (iColor & 0x1F); + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -109,19 +130,19 @@ iNewColor = iColor & 0x1f; /* Copy green */ - iColor >>= 3; - iNewColor |= (iColor & 0x3E0); + iColor >>= 2; + iNewColor |= (iColor & 0x7E0); /* Copy red */ iColor >>= 3; - iNewColor |= (iColor & 0x7C00); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) + iNewColor |= (iColor & 0xF800); + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -142,35 +163,34 @@ ULONG FASTCALL -EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iColor >>= 3; - iNewColor = iColor & 0x1f; - - /* Copy green */ - iColor >>= 2; - iNewColor |= (iColor & 0x7E0); +EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) +{ + return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy blue */ + iNewColor = gajXlate5to8[iColor & 0x1F]; + + /* Copy green */ + iColor >>= 5; + iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; /* Copy red */ - iColor >>= 3; - iNewColor |= (iColor & 0xF800); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) -{ - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) + iColor >>= 5; + iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -190,26 +210,6 @@ ULONG FASTCALL -EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F]; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; - - /* Copy red */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; - - return iNewColor; -} - -ULONG -FASTCALL EXLATEOBJ_iXlate555to565(PEXLATEOBJ pxlo, ULONG iColor) { ULONG iNewColor; @@ -260,6 +260,26 @@ ULONG iNewColor; /* Copy blue */ + iNewColor = gajXlate5to8[iColor & 0x1F]; + + /* Copy green */ + iColor >>= 5; + iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; + + /* Copy red */ + iColor >>= 6; + iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; + + return iNewColor; +} + +ULONG +FASTCALL +EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) +{ + ULONG iNewColor; + + /* Copy blue */ iNewColor = gajXlate5to8[iColor & 0x1F] << 16; /* Copy green */ @@ -269,26 +289,6 @@ /* Copy red */ iColor >>= 6; iNewColor |= gajXlate5to8[iColor & 0x1F]; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F]; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; - - /* Copy blue */ - iColor >>= 6; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; return iNewColor; }

1 0

[jgardou] 48470: [WIN32K, GENDIB] - Did you know that we should ignore alpha channel of pattern in ROPs? You didn't, I didn't, now we do. [WIN32K] - Use BGR palette as default for 24 and 32 bpp bitmaps.
by jgardou＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: jgardou Date: Fri Aug 6 14:55:44 2010 New Revision: 48470 URL: http://svn.reactos.org/svn/reactos?rev=48470&view=rev Log: [WIN32K, GENDIB] - Did you know that we should ignore alpha channel of pattern in ROPs? You didn't, I didn't, now we do. [WIN32K] - Use BGR palette as default for 24 and 32 bpp bitmaps. Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c branches/reactos-yarotows/tools/gendib/gendib.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Fri Aug 6 14:55:44 2010 @@ -150,6 +150,9 @@ 0xF0F0F00F /* 1110 */, 0xF0F0F0F0 /* 1111 */, }; + + /* Ignore alpha channel in Pattern */ + Pattern &= 0x00ffffff ; /* Optimized code for the various named rop codes. */ switch (Rop) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Fri Aug 6 14:55:44 2010 @@ -124,8 +124,8 @@ appalSurfaceDefault[BMF_4BPP] = gppalDefault; appalSurfaceDefault[BMF_8BPP] = gppalDefault; appalSurfaceDefault[BMF_16BPP] = &gpalRGB565; - appalSurfaceDefault[BMF_24BPP] = &gpalRGB; - appalSurfaceDefault[BMF_32BPP] = &gpalRGB; + appalSurfaceDefault[BMF_24BPP] = &gpalBGR; + appalSurfaceDefault[BMF_32BPP] = &gpalBGR; appalSurfaceDefault[BMF_4RLE] = gppalDefault; appalSurfaceDefault[BMF_8RLE] = gppalDefault; appalSurfaceDefault[BMF_JPEG] = &gpalRGB; Modified: branches/reactos-yarotows/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/gendib/g… ============================================================================== --- branches/reactos-yarotows/tools/gendib/gendib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/tools/gendib/gendib.c [iso-8859-1] Fri Aug 6 14:55:44 2010 @@ -143,16 +143,16 @@ { ROPCODE_NOTSRCCOPY, "NOTSRCCOPY", "~S", 0, 1, 0 }, { ROPCODE_SRCERASE, "SRCERASE", "(~D) & S", 1, 1, 0 }, { ROPCODE_DSTINVERT, "DSTINVERT", "~D", 1, 0, 0 }, - { ROPCODE_PATINVERT, "PATINVERT", "D ^ P", 1, 0, 1 }, + { ROPCODE_PATINVERT, "PATINVERT", "D ^ (P & 0x00ffffff)", 1, 0, 1 }, { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, - { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, + { ROPCODE_MERGECOPY, "MERGECOPY", "S & P & 0x00ffffff", 0, 1, 1 }, { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, - { ROPCODE_PATCOPY, "PATCOPY", "P", 0, 0, 1 }, - { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | P", 1, 1, 1 }, + { ROPCODE_PATCOPY, "PATCOPY", "P & 0x00ffffff", 0, 0, 1 }, + { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | (P & 0x00ffffff)", 1, 1, 1 }, { ROPCODE_WHITENESS, "WHITENESS", "0xffffffff", 0, 0, 0 }, { ROPCODE_GENERIC, NULL, NULL, 1, 1, 1 } };

1 0

[fireball] 48469: - (Hack)fix build.
by fireball＠svn.reactos.org 06 Aug '10

06 Aug '10

Author: fireball Date: Fri Aug 6 12:04:12 2010 New Revision: 48469 URL: http://svn.reactos.org/svn/reactos?rev=48469&view=rev Log: - (Hack)fix build. Modified: trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/ole2.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Fri Aug 6 12:04:12 2010 @@ -34,6 +34,8 @@ #include "ctxtcall.h" #include "wine/test.h" + +extern const IID GUID_NULL; /* functions that are not present on all versions of Windows */ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Fri Aug 6 12:04:12 2010 @@ -22,7 +22,7 @@ #define CONST_VTABLE #include <stdarg.h> - +#define NOCRYPT #include "windef.h" #include "winbase.h" #include "objbase.h"

1 0

[fireball] 48468: [CDFS] - MAXIMUM_VOLUME_LABEL_LENGTH is in bytes, not in characters. Fix struct definition and access beyond the buffer. Spotted by Carlo Bramini. - Trim trailing spaces from the volume label name, instead of stopping at the first encountered space. Fix by Carlo Bramini. See issue #5505 for more details.
by fireball＠svn.reactos.org 05 Aug '10

05 Aug '10

Author: fireball Date: Thu Aug 5 21:57:02 2010 New Revision: 48468 URL: http://svn.reactos.org/svn/reactos?rev=48468&view=rev Log: [CDFS] - MAXIMUM_VOLUME_LABEL_LENGTH is in bytes, not in characters. Fix struct definition and access beyond the buffer. Spotted by Carlo Bramini. - Trim trailing spaces from the volume label name, instead of stopping at the first encountered space. Fix by Carlo Bramini. See issue #5505 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Thu Aug 5 21:57:02 2010 @@ -142,7 +142,7 @@ ULONG JolietLevel; ULONG RootStart; ULONG RootSize; - WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH]; + WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; ULONG VolumeLabelLength; ULONG SerialNumber; } CDINFO, *PCDINFO; Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Thu Aug 5 21:57:02 2010 @@ -73,11 +73,24 @@ /* Extract the volume label */ pc = Pvd->VolumeId; pw = CdInfo->VolumeLabel; - for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH && *pc != ' '; i++) + for (i = 0; i < MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR); i++) { *pw++ = (WCHAR)*pc++; } *pw = 0; + + /* Trim trailing spaces */ + while (pw > CdInfo->VolumeLabel) + { + if (*--pw != ' ') break; + + /* Remove the space */ + *pw = '\0'; + + /* Decrease size */ + i--; + } + CdInfo->VolumeLabelLength = i * sizeof(WCHAR); CdInfo->VolumeSpaceSize = Pvd->VolumeSpaceSizeL;

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