Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 13454: Fix definition of LUID constants
by gvg＠svn.reactos.com 07 Feb '05

07 Feb '05

Fix definition of LUID constants Modified: trunk/reactos/include/ntos/security.h Modified: trunk/reactos/ntoskrnl/se/luid.c _____ Modified: trunk/reactos/include/ntos/security.h --- trunk/reactos/include/ntos/security.h 2005-02-06 22:16:05 UTC (rev 13453) +++ trunk/reactos/include/ntos/security.h 2005-02-07 10:29:44 UTC (rev 13454) @@ -74,17 +74,10 @@ #ifndef __USE_W32API -#ifndef _MSC_VER -#define SYSTEM_LUID {{ 0x3E7, 0x0 }} -#define ANONYMOUS_LOGON_LUID {{ 0x3e6, 0x0 }} -#define LOCALSERVICE_LUID {{ 0x3e5, 0x0 }} -#define NETWORKSERVICE_LUID {{ 0x3e4, 0x0 }} -#else #define SYSTEM_LUID { 0x3E7, 0x0 } #define ANONYMOUS_LOGON_LUID { 0x3e6, 0x0 } #define LOCALSERVICE_LUID { 0x3e5, 0x0 } #define NETWORKSERVICE_LUID { 0x3e4, 0x0 } -#endif /* SID Auhority */ #define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} _____ Modified: trunk/reactos/ntoskrnl/se/luid.c --- trunk/reactos/ntoskrnl/se/luid.c 2005-02-06 22:16:05 UTC (rev 13453) +++ trunk/reactos/ntoskrnl/se/luid.c 2005-02-07 10:29:44 UTC (rev 13454) @@ -24,10 +24,11 @@ VOID INIT_FUNCTION SepInitLuid(VOID) { - LARGE_INTEGER DummyLuidValue = SYSTEM_LUID; + LUID DummyLuidValue = SYSTEM_LUID; KeInitializeSpinLock(&LuidLock); - LuidValue = DummyLuidValue; + LuidValue.u.HighPart = DummyLuidValue.HighPart; + LuidValue.u.LowPart = DummyLuidValue.LowPart; LuidIncrement.QuadPart = 1; }

1 0

[gvg] 13453: Hervé Poussineau <poussine@freesurf.fr>
by gvg＠svn.reactos.com 06 Feb '05

06 Feb '05

Hervé Poussineau <poussine(a)freesurf.fr> (Partial) implementation of CheckTokenMembership() Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-02-06 22:06:44 UTC (rev 13452) +++ trunk/reactos/lib/advapi32/token/token.c 2005-02-06 22:16:05 UTC (rev 13453) @@ -313,16 +313,85 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL -CheckTokenMembership(HANDLE Token, PSID SidToCheck, PBOOL IsMember) +CheckTokenMembership (HANDLE ExistingTokenHandle, + PSID SidToCheck, + PBOOL IsMember) { - DPRINT1("CheckTokenMembership not implemented\n"); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + HANDLE AccessToken; + BOOL ReleaseToken = FALSE; + BOOL Result = FALSE; + DWORD dwSize; + DWORD i; + PTOKEN_GROUPS lpGroups = NULL; + TOKEN_TYPE TokenInformation; + + if (IsMember == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (ExistingTokenHandle == NULL) + { + /* Get impersonation token of the calling thread */ + if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &ExistingTokenHandle)) + return FALSE; + + if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) + { + CloseHandle(ExistingTokenHandle); + goto ByeBye; + } + CloseHandle(ExistingTokenHandle); + ReleaseToken = TRUE; + } + else + { + if (!GetTokenInformation(ExistingTokenHandle, TokenType, &TokenInformation, sizeof(TokenInformation), &dwSize)) + goto ByeBye; + if (TokenInformation != TokenImpersonation) + { + /* Duplicate token to have a impersonation token */ + if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) + return FALSE; + ReleaseToken = TRUE; + } + else + AccessToken = ExistingTokenHandle; + } + + *IsMember = FALSE; + /* Search in groups of the token */ + if (!GetTokenInformation(AccessToken, TokenGroups, NULL, 0, &dwSize)) + goto ByeBye; + lpGroups = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (!lpGroups) + goto ByeBye; + if (!GetTokenInformation(AccessToken, TokenGroups, lpGroups, dwSize, &dwSize)) + goto ByeBye; + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(SidToCheck, &lpGroups->Groups[i].Sid)) + { + Result = TRUE; + *IsMember = TRUE; + goto ByeBye; + } + } + /* FIXME: Search in users of the token? */ + DPRINT1("CheckTokenMembership() partially implemented!\n"); + Result = TRUE; + +ByeBye: + if (lpGroups != NULL) + HeapFree(GetProcessHeap(), 0, lpGroups); + if (ReleaseToken) + CloseHandle(AccessToken); + + return Result; } /* EOF */

1 0

[ea] 13452: Add SMDLL to the boot CD.
by ea＠svn.reactos.com 06 Feb '05

06 Feb '05

Add SMDLL to the boot CD. Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-06 22:03:32 UTC (rev 13451) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-06 22:06:44 UTC (rev 13452) @@ -116,6 +116,7 @@ lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 lib\shlwapi\shlwapi.dll 1 +lib\smdll\smdll.dll 1 lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 lib\urlmon\urlmon.dll 1

1 0

[ea] 13451: SMDLL: add it to the build process.
by ea＠svn.reactos.com 06 Feb '05

06 Feb '05

SMDLL: add it to the build process. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-06 21:57:44 UTC (rev 13450) +++ trunk/reactos/Makefile 2005-02-06 22:03:32 UTC (rev 13451) @@ -58,8 +58,8 @@ DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \ - unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ + packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ + twain unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm

1 0

[gvg] 13450: - Add RegisterServiceCtrlHandlerExA/W
by gvg＠svn.reactos.com 06 Feb '05

06 Feb '05

- Add RegisterServiceCtrlHandlerExA/W - Add stubs for CheckTokenMembership and LsaGetUserName Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/sec/lsa.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-02-06 21:55:07 UTC (rev 13449) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-02-06 21:57:44 UTC (rev 13450) @@ -45,6 +45,7 @@ BuildTrusteeWithSidW@8 ChangeServiceConfigA@44 ChangeServiceConfigW@44 +CheckTokenMembership@12 ClearEventLogA@8 ClearEventLogW@8 CloseEventLog@4 @@ -235,7 +236,7 @@ LsaFreeMemory@4 ;LsaGetQuotasForAccount@8 ;LsaGetSystemAccessAccount@8 -;LsaGetUserName@8 +LsaGetUserName@8 ;LsaICLookupNames@32 ;LsaICLookupSids@32 ;LsaLookupNames@20 @@ -359,6 +360,8 @@ RegisterEventSourceW@8 RegisterServiceCtrlHandlerA@8 RegisterServiceCtrlHandlerW@8 +RegisterServiceCtrlHandlerExA@12 +RegisterServiceCtrlHandlerExW@12 ;ReplaceAllAccessRightsA ;ReplaceAllAccessRightsW ReportEventA@36 _____ Modified: trunk/reactos/lib/advapi32/sec/lsa.c --- trunk/reactos/lib/advapi32/sec/lsa.c 2005-02-06 21:55:07 UTC (rev 13449) +++ trunk/reactos/lib/advapi32/sec/lsa.c 2005-02-06 21:57:44 UTC (rev 13450) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/lsa.c @@ -493,3 +492,19 @@ { return STATUS_NOT_IMPLEMENTED; } + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +LsaGetUserName( + PUNICODE_STRING *UserName, + PUNICODE_STRING *DomainName) +{ + DPRINT1("LsaGetUserName not implemented\n"); + + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-02-06 21:55:07 UTC (rev 13449) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-02-06 21:57:44 UTC (rev 13450) @@ -31,6 +31,8 @@ LPSERVICE_MAIN_FUNCTIONW lpFuncW; } Main; LPHANDLER_FUNCTION HandlerFunction; + LPHANDLER_FUNCTION_EX HandlerFunctionEx; + LPVOID HandlerContext; SERVICE_STATUS ServiceStatus; BOOL bUnicode; LPWSTR Arguments; @@ -326,12 +328,70 @@ } Service->HandlerFunction = lpHandlerProc; + Service->HandlerFunctionEx = NULL; return (SERVICE_STATUS_HANDLE)Service->ThreadId; } /********************************************************************** + * RegisterServiceCtrlHandlerExA + * + * @implemented + */ +SERVICE_STATUS_HANDLE STDCALL +RegisterServiceCtrlHandlerExA(LPCSTR lpServiceName, + LPHANDLER_FUNCTION_EX lpHandlerProc, + LPVOID lpContext) +{ + ANSI_STRING ServiceNameA; + UNICODE_STRING ServiceNameU; + SERVICE_STATUS_HANDLE SHandle; + + RtlInitAnsiString(&ServiceNameA, (LPSTR)lpServiceName); + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) + { + SetLastError(ERROR_OUTOFMEMORY); + return (SERVICE_STATUS_HANDLE)0; + } + + SHandle = RegisterServiceCtrlHandlerExW(ServiceNameU.Buffer, + lpHandlerProc, + lpContext); + + RtlFreeUnicodeString(&ServiceNameU); + + return SHandle; +} + + +/********************************************************************** + * RegisterServiceCtrlHandlerExW + * + * @implemented + */ +SERVICE_STATUS_HANDLE STDCALL +RegisterServiceCtrlHandlerExW(LPCWSTR lpServiceName, + LPHANDLER_FUNCTION_EX lpHandlerProc, + LPVOID lpContext) +{ + PACTIVE_SERVICE Service; + + Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); + if (Service == NULL) + { + return (SERVICE_STATUS_HANDLE)NULL; + } + + Service->HandlerFunction = NULL; + Service->HandlerFunctionEx = lpHandlerProc; + Service->HandlerContext = lpContext; + + return (SERVICE_STATUS_HANDLE)Service->ThreadId; +} + + +/********************************************************************** * SetServiceBits * * @unimplemented _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-02-06 21:55:07 UTC (rev 13449) +++ trunk/reactos/lib/advapi32/token/token.c 2005-02-06 21:57:44 UTC (rev 13450) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/token/token.c @@ -11,6 +10,8 @@ #include "advapi32.h" +#define NDEBUG +#include <debug.h> /* * @implemented @@ -310,4 +311,18 @@ DuplicateTokenHandle); } + +/* + * @unimplemented + */ +BOOL STDCALL +CheckTokenMembership(HANDLE Token, PSID SidToCheck, PBOOL IsMember) +{ + DPRINT1("CheckTokenMembership not implemented\n"); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} + /* EOF */

1 0

[ea] 13449: Some preliminary work on the SM to make it manage environment servers.
by ea＠svn.reactos.com 06 Feb '05

06 Feb '05

Some preliminary work on the SM to make it manage environment servers. Added: trunk/reactos/subsys/smss/client.c Added: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/init.c Modified: trunk/reactos/subsys/smss/makefile Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Added: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/client.c 2005-02-06 21:55:07 UTC (rev 13449) @@ -0,0 +1,116 @@ +/* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $ + * + * client.c - Session Manager client Management + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> +#include "smss.h" + +/* Private ADT */ + +typedef struct _SM_CLIENT_DATA +{ + USHORT SubsystemId; + BOOL Initialized; + HANDLE ServerProcess; + HANDLE ApiPort; + HANDLE SbApiPort; + struct _SM_CLIENT_DATA * Next; + +} SM_CLIENT_DATA, *PSM_CLIENT_DATA; + + +struct _SM_CLIENT_DIRECTORY +{ + RTL_CRITICAL_SECTION Lock; + ULONG Count; + PSM_CLIENT_DATA Client; + +} SmpClientDirectory; + +/********************************************************************** + * SmpInitializeClientManagement/0 + */ +VOID STDCALL +SmpInitializeClientManagement (VOID) +{ + RtlInitializeCriticalSection(& SmpClientDirectory.Lock); + SmpClientDirectory.Count = 0; + SmpClientDirectory.Client = NULL; +} + +/********************************************************************** + * SmpCreateClient/1 + */ +NTSTATUS STDCALL +SmpCreateClient(SM_PORT_MESSAGE Request) +{ + PSM_CLIENT_DATA pClient = NULL; + + /* + * Allocate the storage for client data + */ + pClient = RtlAllocateHeap (SmpHeap, + HEAP_ZERO_MEMORY, + sizeof (SM_CLIENT_DATA)); + if (NULL == pClient) return STATUS_NO_MEMORY; + /* + * Initialize the client data + */ + // TODO + /* + * Insert the new descriptor in the + * client directory. + */ + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + if (NULL == SmpClientDirectory.Client) + { + SmpClientDirectory.Client = pClient; + } else { + PSM_CLIENT_DATA pCD = NULL; + + for (pCD=SmpClientDirectory.Client; + (NULL != pCD->Next); + pCD = pCD->Next); + pCD->Next = pClient; + } + ++ SmpClientDirectory.Count; + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_SUCCESS; +} + +/********************************************************************** + * SmpDestroyClient/1 + */ +NTSTATUS STDCALL +SmpDestroyClient (ULONG SubsystemId) +{ + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + /* TODO */ + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return STATUS_SUCCESS; +} + +/* EOF */ _____ Added: trunk/reactos/subsys/smss/debug.c --- trunk/reactos/subsys/smss/debug.c 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/debug.c 2005-02-06 21:55:07 UTC (rev 13449) @@ -0,0 +1,92 @@ +/* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $ + * + * client.c - Session Manager client Management + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#define NTOS_MODE_USER +#include <ntos.h> +#include <rosrtl/string.h> +#include <sm/api.h> +#include "smss.h" + +/* GLOBALS ***********************************************************/ + +HANDLE DbgSsApiPort = INVALID_HANDLE_VALUE; +HANDLE DbgUiApiPort = INVALID_HANDLE_VALUE; + +/* FUNCTIONS *********************************************************/ + +NTSTATUS STDCALL +SmpInitializeDbgSs (VOID) +{ + NTSTATUS Status; + UNICODE_STRING UnicodeString; + OBJECT_ATTRIBUTES ObjectAttributes; + + + /* Create the \DbgSsApiPort object (LPC) */ + RtlRosInitUnicodeStringFromLiteral(&UnicodeString, + L"\\DbgSsApiPort"); + InitializeObjectAttributes(&ObjectAttributes, + &UnicodeString, + PORT_ALL_ACCESS, + NULL, + NULL); + + Status = NtCreatePort(&DbgSsApiPort, + &ObjectAttributes, + 0, + 0, + 0); + + if (!NT_SUCCESS(Status)) + { + return(Status); + } + DbgPrint("SMSS: %s: \\DbgSsApiPort created\n",__FUNCTION__); + + /* Create the \DbgUiApiPort object (LPC) */ + RtlRosInitUnicodeStringFromLiteral(&UnicodeString, + L"\\DbgUiApiPort"); + InitializeObjectAttributes(&ObjectAttributes, + &UnicodeString, + PORT_ALL_ACCESS, + NULL, + NULL); + + Status = NtCreatePort(&DbgUiApiPort, + &ObjectAttributes, + 0, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + DbgPrint("SMSS: %s: \\DbgUiApiPort created\n",__FUNCTION__); + + return STATUS_SUCCESS; +} + +/* EOF */ + _____ Modified: trunk/reactos/subsys/smss/init.c --- trunk/reactos/subsys/smss/init.c 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/init.c 2005-02-06 21:55:07 UTC (rev 13449) @@ -33,7 +33,7 @@ #include <ntdll/rtl.h> #include <ntdll/ldr.h> #include <rosrtl/string.h> - +#include <sm/api.h> #include "smss.h" #define NDEBUG @@ -41,8 +41,7 @@ /* GLOBALS ******************************************************************/ -HANDLE DbgSsApiPort = INVALID_HANDLE_VALUE; -HANDLE DbgUiApiPort = INVALID_HANDLE_VALUE; +HANDLE SmpHeap = NULL; PWSTR SmSystemEnvironment = NULL; @@ -824,6 +823,20 @@ HANDLE CsrssInitEvent; WCHAR UnicodeBuffer[MAX_PATH]; + /* Create our own heap */ + SmpHeap = RtlCreateHeap(HEAP_GROWABLE, + NULL, + 65536, + 65536, + NULL, + NULL); + if (NULL == SmpHeap) + { + DbgPrint("SMSS: %s: failed to create private heap, aborting\n",__FUNCTION__); + return STATUS_UNSUCCESSFUL; + } + + /* Create object directories */ Status = SmCreateObjectDirectories(); if (!NT_SUCCESS(Status)) @@ -832,8 +845,8 @@ return(Status); } - /* Create the SmApiPort object (LPC) */ - Status = SmCreateApiPort(); + /* Create the \SmApiPort object (LPC) */ + Status = SmpCreateApiPort(); if (!NT_SUCCESS(Status)) { DPRINT1("SM: Failed to create SmApiPort (Status %lx)\n", Status); @@ -916,6 +929,13 @@ } #endif + /* + * Initialize SM client management: + * this MUST be done before any + * subsystem server is run. + */ + SmpInitializeClientManagement(); + DPRINT("SM: loading subsystems\n"); /* Load the subsystems */ @@ -1043,51 +1063,16 @@ } Children[CHILD_WINLOGON] = ProcessInfo.ProcessHandle; - /* Create the \DbgSsApiPort object (LPC) */ - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, - L"\\DbgSsApiPort"); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - PORT_ALL_ACCESS, - NULL, - NULL); - - Status = NtCreatePort(&DbgSsApiPort, - &ObjectAttributes, - 0, - 0, - 0); - + /* Initialize the DBGSS */ + Status = SmpInitializeDbgSs(); if (!NT_SUCCESS(Status)) { + DisplayString(L"SM: DbgSs initialization failed!\n"); + NtTerminateProcess(Children[CHILD_WINLOGON],0); + NtTerminateProcess(Children[CHILD_CSRSS],0); return(Status); } -#ifndef NDEBUG - DisplayString(L"SM: DbgSsApiPort created...\n"); -#endif - /* Create the \DbgUiApiPort object (LPC) */ - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, - L"\\DbgUiApiPort"); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - PORT_ALL_ACCESS, - NULL, - NULL); - - Status = NtCreatePort(&DbgUiApiPort, - &ObjectAttributes, - 0, - 0, - 0); - if (!NT_SUCCESS(Status)) - { - return(Status); - } -#ifndef NDEBUG - DisplayString (L"SM: DbgUiApiPort created...\n"); -#endif - return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/smss/makefile --- trunk/reactos/subsys/smss/makefile 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/makefile 2005-02-06 21:55:07 UTC (rev 13449) @@ -15,7 +15,7 @@ # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror -TARGET_OBJECTS = $(TARGET_NAME).o init.o smapi.o +TARGET_OBJECTS = $(TARGET_NAME).o init.o smapi.o client.o debug.o include $(PATH_TO_TOP)/rules.mak _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/smapi.c 2005-02-06 21:55:07 UTC (rev 13449) @@ -5,10 +5,12 @@ * */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +/*#include <ddk/ntddk.h> +#include <ntdll/rtl.h>*/ +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/api.h> #include <rosrtl/string.h> - #include "smss.h" #define NDEBUG @@ -17,62 +19,123 @@ static HANDLE SmApiPort = INVALID_HANDLE_VALUE; -/* FUNCTIONS ****************************************************************/ +/* SM API **********************************************************************/ +#define SMAPI(n) \ +NTSTATUS FASTCALL n (PSM_PORT_MESSAGE Request) +SMAPI(SmInvalid) +{ + DbgPrint("SMSS: %s called\n",__FUNCTION__); + Request->Status = STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; +} + +SMAPI(SmCompSes) +{ + DbgPrint("SMSS: %s called\n",__FUNCTION__); + Request->Status = STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; +} +SMAPI(SmExecPgm) +{ + DbgPrint("SMSS: %s called\n",__FUNCTION__); + Request->Status = STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; +} + +/* SM API Table */ +typedef NTSTATUS (FASTCALL * SM_PORT_API)(PSM_PORT_MESSAGE); + +SM_PORT_API SmApi [] = +{ + SmInvalid, /* unused */ + SmCompSes, + SmInvalid, /* obsolete */ + SmInvalid, /* unknown */ + SmExecPgm +}; + + +/********************************************************************** + * NAME + * SmpHandleConnectionRequest/2 + * + * REMARKS + * Quoted in http://support.microsoft.com/kb/258060/EN-US/ + */ +NTSTATUS STDCALL +SmpHandleConnectionRequest (HANDLE Port, PSM_PORT_MESSAGE Request) +{ + DbgPrint("SMSS: %s called\n",__FUNCTION__); + return STATUS_SUCCESS; +} + +/********************************************************************** + * NAME + * SmpApiThread/1 + * + * DESCRIPTION + * Entry point for the listener thread of LPC port "\SmApiPort". + */ VOID STDCALL -SmApiThread(HANDLE Port) +SmpApiThread(HANDLE Port) { - NTSTATUS Status; - ULONG Unknown; - PLPC_MESSAGE Reply = NULL; - LPC_MESSAGE Message; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Unknown = 0; + PLPC_MESSAGE Reply = NULL; + SM_PORT_MESSAGE Request = {{0}}; -#ifndef NDEBUG - DisplayString(L"SmApiThread: running\n"); -#endif + DbgPrint("SMSS: %s running.\n",__FUNCTION__); - while (TRUE) - { -#ifndef NDEBUG - DisplayString(L"SmApiThread: waiting for message\n"); -#endif - - Status = NtReplyWaitReceivePort(Port, - &Unknown, - Reply, - &Message); - if (NT_SUCCESS(Status)) + while (TRUE) { -#ifndef NDEBUG - DisplayString(L"SmApiThread: message received\n"); -#endif + DbgPrint("SMSS: %s: waiting for message\n",__FUNCTION__); - if (Message.MessageType == LPC_CONNECTION_REQUEST) - { -// SmHandleConnectionRequest (Port, &Message); - Reply = NULL; - } - else if (Message.MessageType == LPC_DEBUG_EVENT) - { -// DbgSsHandleKmApiMsg (&Message, 0); - Reply = NULL; - } - else if (Message.MessageType == LPC_PORT_CLOSED) - { - Reply = NULL; - } - else - { -// Reply = &Message; - } + Status = NtReplyWaitReceivePort(Port, + & Unknown, + Reply, + (PLPC_MESSAGE) & Request); + if (NT_SUCCESS(Status)) + { + DbgPrint("SMSS: %s: message received\n",__FUNCTION__); + + switch (Request.Header.MessageType) + { + case LPC_CONNECTION_REQUEST: + SmpHandleConnectionRequest (Port, &Request); + Reply = NULL; + break; + case LPC_DEBUG_EVENT: +// DbgSsHandleKmApiMsg (&Request, 0); + Reply = NULL; + break; + case LPC_PORT_CLOSED: + Reply = NULL; + break; + default: + if ((Request.ApiIndex) && + (Request.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) + { + Status = SmApi[Request.ApiIndex](&Request); + Reply = (PLPC_MESSAGE) & Request; + } else { + Request.Status = STATUS_NOT_IMPLEMENTED; + Reply = (PLPC_MESSAGE) & Request; + } + } + } } - } } - +/********************************************************************** + * NAME + * SmpCreateApiPort/0 + * + * DECRIPTION + */ NTSTATUS -SmCreateApiPort(VOID) +SmpCreateApiPort(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING UnicodeString; @@ -103,7 +166,7 @@ 0, NULL, NULL, - (PTHREAD_START_ROUTINE)SmApiThread, + (PTHREAD_START_ROUTINE)SmpApiThread, (PVOID)SmApiPort, NULL, NULL); @@ -114,7 +177,7 @@ 0, NULL, NULL, - (PTHREAD_START_ROUTINE)SmApiThread, + (PTHREAD_START_ROUTINE)SmpApiThread, (PVOID)SmApiPort, NULL, NULL); _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/smss.c 2005-02-06 21:55:07 UTC (rev 13449) @@ -27,7 +27,7 @@ * Compiled successfully with egcs 1.1.2 */ #include <ddk/ntddk.h> - +#include <sm/api.h> #include "smss.h" #define NDEBUG _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-02-06 21:21:22 UTC (rev 13448) +++ trunk/reactos/subsys/smss/smss.h 2005-02-06 21:55:07 UTC (rev 13449) @@ -1,4 +1,3 @@ - #ifndef _SMSS_H_INCLUDED_ #define _SMSS_H_INCLUDED_ @@ -15,6 +14,9 @@ /* FUNCTIONS ***********/ /* init.c */ + +extern HANDLE SmpHeap; + NTSTATUS InitSessionManager(HANDLE Children[]); @@ -23,17 +25,33 @@ void DisplayString (LPCWSTR lpwString); void PrintString (char* fmt,...); - /* smapi.c */ NTSTATUS -SmCreateApiPort(VOID); +SmpCreateApiPort(VOID); VOID STDCALL -SmApiThread(HANDLE Port); +SmpApiThread(HANDLE Port); +/* client.c */ +VOID STDCALL +SmpInitializeClientManagement(VOID); +NTSTATUS STDCALL +SmpCreateClient(SM_PORT_MESSAGE); + +NTSTATUS STDCALL +SmpDestroyClient(ULONG); + +/* debug.c */ + +extern HANDLE DbgSsApiPort; +extern HANDLE DbgUiApiPort; + +NTSTATUS STDCALL +SmpInitializeDbgSs(VOID); + #endif /* _SMSS_H_INCLUDED_ */ /* EOF */

1 0

[gvg] 13448: Export some Lsa stubs
by gvg＠svn.reactos.com 06 Feb '05

06 Feb '05

Export some Lsa stubs Modified: trunk/reactos/lib/advapi32/advapi32.def _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-02-06 19:52:26 UTC (rev 13447) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-02-06 21:21:22 UTC (rev 13448) @@ -255,7 +255,7 @@ ;LsaQueryTrustedDomainInfo@16 ;LsaRemoveAccountRights@20 ;LsaRemovePrivilegesFromAccount@12 -;LsaRetrievePrivateData@12 +LsaRetrievePrivateData@12 ;LsaSetInformationPolicy@12 ;LsaSetInformationTrustedDomain@12 ;LsaSetQuotasForAccount@8 @@ -263,7 +263,7 @@ ;LsaSetSecurityObject@12 ;LsaSetSystemAccessAccount@8 ;LsaSetTrustedDomainInformation@16 -;LsaStorePrivateData@12 +LsaStorePrivateData@12 MakeAbsoluteSD@44 MakeSelfRelativeSD@12 MapGenericMask@8

1 0

[gvg] 13447: - Prevent image loading and symbol loading getting each others way
by gvg＠svn.reactos.com 06 Feb '05

06 Feb '05

- Prevent image loading and symbol loading getting each others way - DPRINT1 is preferred over DbgPrint Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-02-06 19:04:00 UTC (rev 13446) +++ trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-02-06 19:52:26 UTC (rev 13447) @@ -450,10 +450,10 @@ DPRINT("Attempting to open image: %wZ\n", FileName); Status = ZwOpenFile(&FileHandle, - FILE_ALL_ACCESS, + FILE_READ_ACCESS, &ObjectAttributes, &IoStatusBlock, - 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NO_INTERMEDIATE_BUFFERING); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c --- trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-02-06 19:04:00 UTC (rev 13446) +++ trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-02-06 19:52:26 UTC (rev 13447) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -93,14 +93,14 @@ NULL); DPRINT("Opening NTDLL\n"); Status = ZwOpenFile(&FileHandle, - FILE_ALL_ACCESS, + FILE_READ_ACCESS, &FileObjectAttributes, &Iosb, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { - DbgPrint("NTDLL open failed (Status %x)\n", Status); + DPRINT1("NTDLL open failed (Status %x)\n", Status); return Status; } Status = ZwReadFile(FileHandle, @@ -114,7 +114,7 @@ 0); if (!NT_SUCCESS(Status) || Iosb.Information != sizeof(BlockBuffer)) { - DbgPrint("NTDLL header read failed (Status %x)\n", Status); + DPRINT1("NTDLL header read failed (Status %x)\n", Status); ZwClose(FileHandle); return Status; } @@ -129,7 +129,7 @@ || (DosHeader->e_lfanew == 0L) || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { - DbgPrint("NTDLL format invalid\n"); + DPRINT1("NTDLL format invalid\n"); ZwClose(FileHandle); return(STATUS_UNSUCCESSFUL); } @@ -149,7 +149,7 @@ FileHandle); if (!NT_SUCCESS(Status)) { - DbgPrint("NTDLL create section failed (Status %x)\n", Status); + DPRINT1("NTDLL create section failed (Status %x)\n", Status); ZwClose(FileHandle); return(Status); } @@ -172,7 +172,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DbgPrint("NTDLL map view of secion failed (Status %x)", Status); + DPRINT1("NTDLL map view of secion failed (Status %x)", Status); ZwClose(NTDllSectionHandle); return(Status); } @@ -186,7 +186,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("ObReferenceObjectByProcess() failed (Status %x)\n", Status); + DPRINT1("ObReferenceObjectByProcess() failed (Status %x)\n", Status); return(Status); } @@ -210,7 +210,7 @@ &SystemDllEntryPoint); if (!NT_SUCCESS(Status)) { - DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n", Status); + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); if (Process != CurrentProcess) { KeDetachProcess(); @@ -235,7 +235,7 @@ &SystemDllApcDispatcher); if (!NT_SUCCESS(Status)) { - DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n", Status); + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); if (Process != CurrentProcess) { KeDetachProcess(); @@ -259,7 +259,7 @@ &SystemDllExceptionDispatcher); if (!NT_SUCCESS(Status)) { - DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n", Status); + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); if (Process != CurrentProcess) { KeDetachProcess(); @@ -283,7 +283,7 @@ &SystemDllCallbackDispatcher); if (!NT_SUCCESS(Status)) { - DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n", Status); + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); if (Process != CurrentProcess) { KeDetachProcess(); @@ -307,7 +307,7 @@ &SystemDllRaiseExceptionDispatcher); if (!NT_SUCCESS(Status)) { - DbgPrint ("LdrGetProcedureAddress failed (Status %x)\n", Status); + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); if (Process != CurrentProcess) { KeDetachProcess();

1 0

[gdalsnes] 13446: -add macros for msvc/gcc portable int64 suffix/LARGE_INTEGER handling
by gdalsnes＠svn.reactos.com 06 Feb '05

06 Feb '05

-add macros for msvc/gcc portable int64 suffix/LARGE_INTEGER handling -add C_ASSERT (compile-time asserts) Modified: trunk/reactos/include/ntos/ntdef.h _____ Modified: trunk/reactos/include/ntos/ntdef.h --- trunk/reactos/include/ntos/ntdef.h 2005-02-06 18:27:06 UTC (rev 13445) +++ trunk/reactos/include/ntos/ntdef.h 2005-02-06 19:04:00 UTC (rev 13446) @@ -32,18 +32,45 @@ # define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT(DWORD) #endif + +#if defined(_MSC_VER) + #define Const64(a) (a##i64) + static __inline LARGE_INTEGER MK_LARGE_INTEGER(__int64 i) + { + LARGE_INTEGER li; + li.QuadPart = i; + return li; + } + #define INIT_LARGE_INTEGER(a) {{(ULONG)a, (LONG)(a>>32)}} +#elif defined (__GNUC__) + #define Const64(a) (a##LL) + #define MK_LARGE_INTEGER(a) ((LARGE_INTEGER)(LONGLONG)(a)) + #define INIT_LARGE_INTEGER(a) MK_LARGE_INTEGER(Const64(a)) +#endif + +#define LargeInteger0 MK_LARGE_INTEGER(0) + + +/* Compile time asserts */ +#define C_ASSERT(e) do{extern char __C_ASSERT__[(e)?1:-1]; (void)__C_ASSERT__;}while(0) + + /* Helpers for easy conversion to system time units (100ns) */ #define ABSOLUTE_TIME(wait) (wait) #define RELATIVE_TIME(wait) (-(wait)) -#define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100L) -#define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000L)) -#define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000L)) -#define SECONDS_TO_100NS(seconds) (((LONGLONG)(seconds)) * MILLIS_TO_100NS(1000L)) +#define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100) +#define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000)) +#define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000)) +#define SECONDS_TO_100NS(seconds) (((LONGLONG)(seconds)) * MILLIS_TO_100NS(1000)) +#define MINUTES_TO_100NS(minutes) (((LONGLONG)(minutes)) * SECONDS_TO_100NS(60)) +#define HOURS_TO_100NS(hours) (((LONGLONG)(hours)) * MINUTES_TO_100NS(60)) + + /* Helpers for enumarating lists */ #define LIST_FOR_EACH(entry, head) \ - for(entry = (head)->Flink; entry != (head); entry = entry->Flink) + for((entry) = (head)->Flink; (entry) != (head); (entry) = (entry)->Flink) /* Safe version which saves pointer to the next entry so the current ptr->field entry

1 0

[gvg] 13445: Pass ROP4 instead of ROP3 to drivers
by gvg＠svn.reactos.com 06 Feb '05

06 Feb '05

Pass ROP4 instead of ROP3 to drivers Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.h Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/copybits.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/eng/transblt.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -188,20 +188,21 @@ } /* Punt pattern fills. */ - if ((Rop4 == PATCOPY || Rop4 == PATINVERT) && + if ((GET_OPINDEX_FROM_ROP4(Rop4) == GET_OPINDEX_FROM_ROP3(PATCOPY) + || GET_OPINDEX_FROM_ROP4(Rop4) == GET_OPINDEX_FROM_ROP3(PATINVERT)) && Brush->iSolidColor == 0xFFFFFFFF) { return(FALSE); } /* Get the brush colour. */ - switch (Rop4) + switch (GET_OPINDEX_FROM_ROP4(Rop4)) { - case PATCOPY: SolidColor = Brush->iSolidColor; break; - case PATINVERT: SolidColor = Brush->iSolidColor; RasterOp = VGA_XOR; break; - case WHITENESS: SolidColor = 0xF; break; - case BLACKNESS: SolidColor = 0x0; break; - case DSTINVERT: SolidColor = 0xF; RasterOp = VGA_XOR; break; + case GET_OPINDEX_FROM_ROP3(PATCOPY): SolidColor = Brush->iSolidColor; break; + case GET_OPINDEX_FROM_ROP3(PATINVERT): SolidColor = Brush->iSolidColor; RasterOp = VGA_XOR; break; + case GET_OPINDEX_FROM_ROP3(WHITENESS): SolidColor = 0xF; break; + case GET_OPINDEX_FROM_ROP3(BLACKNESS): SolidColor = 0x0; break; + case GET_OPINDEX_FROM_ROP3(DSTINVERT): SolidColor = 0xF; RasterOp = VGA_XOR; break; } /* Select write mode 3. */ @@ -398,15 +399,15 @@ switch (rop4) { - case BLACKNESS: - case PATCOPY: - case WHITENESS: - case PATINVERT: - case DSTINVERT: + case ROP3_TO_ROP4(BLACKNESS): + case ROP3_TO_ROP4(PATCOPY): + case ROP3_TO_ROP4(WHITENESS): + case ROP3_TO_ROP4(PATINVERT): + case ROP3_TO_ROP4(DSTINVERT): BltRectFunc = VGADDI_BltBrush; break; - case SRCCOPY: + case ROP3_TO_ROP4(SRCCOPY): if (BMF_4BPP == Source->iBitmapFormat && BMF_4BPP == Dest->iBitmapFormat) { BltRectFunc = VGADDI_BltSrc; @@ -417,7 +418,7 @@ } break; - case 0xAACC: + case R4_MASK: BltRectFunc = VGADDI_BltMask; break; _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.h --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.h 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.h 2005-02-06 18:27:06 UTC (rev 13445) @@ -20,3 +20,10 @@ #define BB_TARGET_ONLY 0x0002 #define BB_SOURCE_COPY 0x0004 #define BB_PATTERN_COPY 0x0008 + +#define GET_OPINDEX_FROM_ROP3(Rop3) (((Rop3) >> 16) & 0xff) +#define GET_OPINDEX_FROM_ROP4(Rop4) ((Rop4) & 0xff) +#define ROP3_TO_ROP4(Rop3) ((((Rop3) >> 8) & 0xff00) | (((Rop3) >> 16) & 0x00ff)) +#define R3_OPINDEX_SRCCOPY 0xcc +#define R3_OPINDEX_NOOP 0xaa +#define R4_MASK ((R3_OPINDEX_NOOP << 8) | R3_OPINDEX_SRCCOPY) _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -156,25 +156,25 @@ /* Optimized code for the various named rop codes. */ switch (Rop) { - case BLACKNESS: return(0); - case NOTSRCERASE: return(~(Dest | Source)); - case NOTSRCCOPY: return(~Source); - case SRCERASE: return((~Dest) & Source); - case DSTINVERT: return(~Dest); - case PATINVERT: return(Dest ^ Pattern); - case SRCINVERT: return(Dest ^ Source); - case SRCAND: return(Dest & Source); - case MERGEPAINT: return(Dest & (~Source)); - case SRCPAINT: return(Dest | Source); - case MERGECOPY: return(Source & Pattern); - case SRCCOPY: return(Source); - case PATCOPY: return(Pattern); - case PATPAINT: return(Dest | (~Source) | Pattern); - case WHITENESS: return(0xFFFFFFFF); + case ROP3_TO_ROP4(BLACKNESS): return(0); + case ROP3_TO_ROP4(NOTSRCERASE): return(~(Dest | Source)); + case ROP3_TO_ROP4(NOTSRCCOPY): return(~Source); + case ROP3_TO_ROP4(SRCERASE): return((~Dest) & Source); + case ROP3_TO_ROP4(DSTINVERT): return(~Dest); + case ROP3_TO_ROP4(PATINVERT): return(Dest ^ Pattern); + case ROP3_TO_ROP4(SRCINVERT): return(Dest ^ Source); + case ROP3_TO_ROP4(SRCAND): return(Dest & Source); + case ROP3_TO_ROP4(MERGEPAINT): return(Dest & (~Source)); + case ROP3_TO_ROP4(SRCPAINT): return(Dest | Source); + case ROP3_TO_ROP4(MERGECOPY): return(Source & Pattern); + case ROP3_TO_ROP4(SRCCOPY): return(Source); + case ROP3_TO_ROP4(PATCOPY): return(Pattern); + case ROP3_TO_ROP4(PATPAINT): return(Dest | (~Source) | Pattern); + case ROP3_TO_ROP4(WHITENESS): return(0xFFFFFFFF); } /* Expand the ROP operation to all four bytes */ - Rop &= 0x00FF0000; - Rop = (Rop << 8) | (Rop) | (Rop >> 8) | (Rop >> 16); + Rop &= 0xFF; + Rop |= (Rop << 24) | (Rop << 16) | (Rop << 8); /* Do the operation on four bits simultaneously. */ Result = 0; for (i = 0; i < 8; i++) _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-02-06 18:27:06 UTC (rev 13445) @@ -99,9 +99,6 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); -#define ROP_USES_SOURCE(Rop4) (((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000)) -#define ROP_USES_PATTERN(Rop4) (((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000)) - extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; #define MASK1BPP(x) (1<<(7-((x)&7))) _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -309,8 +309,8 @@ PULONG DestBits; ULONG RoundedRight; - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x1); _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -349,8 +349,8 @@ ULONG RoundedRight; /* BYTE NoBits;*/ - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 31); _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -244,8 +244,8 @@ BOOL UsesPattern; PBYTE DestBits; - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); SourceY = BltInfo->SourcePoint.y; DestBits = (PBYTE)( _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -293,8 +293,8 @@ BOOL UsesPattern; PULONG DestBits; - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); SourceY = BltInfo->SourcePoint.y; DestBits = (PULONG)( _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -251,8 +251,8 @@ 0xFFFFFFFF /* 15 */, }; - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); SourceY = BltInfo->SourcePoint.y; RoundedRight = BltInfo->DestRect.right - _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -260,8 +260,8 @@ PULONG DestBits; LONG RoundedRight; - UsesSource = ROP_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP_USES_PATTERN(BltInfo->Rop4); + UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); SourceY = BltInfo->SourcePoint.y; RoundedRight = BltInfo->DestRect.right - _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -213,7 +213,7 @@ BltInfo.DestRect = *OutputRect; BltInfo.SourcePoint = *InputPoint; - if (Rop4 == SRCCOPY) + if (ROP3_TO_ROP4(SRCCOPY) == Rop4) return DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_BitBltSrcCopy( &BltInfo); BltInfo.XlatePatternToDest = NULL; @@ -222,7 +222,7 @@ BltInfo.Rop4 = Rop4; /* Pattern brush */ - if (ROP_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF) + if (ROP4_USES_PATTERN(Rop4) && Brush->iSolidColor == 0xFFFFFFFF) { GdiBrush = CONTAINING_RECORD(Brush, GDIBRUSHINST, BrushObject); if((bmPattern = BITMAPOBJ_LockBitmap(GdiBrush->GdiBrushObject->hbmPattern))) @@ -291,9 +291,9 @@ BOOL UsesPattern; POINTL AdjustedBrushOrigin; - UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000); - UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000); - if (ROP_NOOP == Rop4) + UsesSource = ROP4_USES_SOURCE(Rop4); + UsesPattern = ROP4_USES_PATTERN(Rop4); + if (R4_NOOP == Rop4) { /* Copy destination onto itself: nop */ return TRUE; @@ -392,20 +392,16 @@ clippingType = ClipRegion->iDComplexity; } - if (0xaacc == Rop4) + if (R4_MASK == Rop4) { BltRectFunc = BltMask; } - else if (PATCOPY == Rop4) + else if (ROP3_TO_ROP4(PATCOPY) == Rop4) { -#if 0 - BltRectFunc = BltPatCopy; -#else if (Brush->iSolidColor == 0xFFFFFFFF) BltRectFunc = CallDibBitBlt; else BltRectFunc = BltPatCopy; -#endif } else { @@ -515,7 +511,7 @@ InputClippedRect.top = DestRect->bottom; InputClippedRect.bottom = DestRect->top; } - UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000); + UsesSource = ROP4_USES_SOURCE(Rop4); if (UsesSource) { if (NULL == SourcePoint || NULL == SourceSurf) @@ -833,40 +829,41 @@ tMask = Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) + SourcePoint->x; for (j = 0; j < dy; j++) - { - lMask = tMask; - for (i = 0; i < dx; i++) - { - if (*lMask > 0) - { - if(*lMask == 0xff) - { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); - } - else - { - Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, SrcColorTranslation); + { + lMask = tMask; + for (i = 0; i < dx; i++) + { + if (*lMask > 0) + { + if (*lMask == 0xff) + { + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, Brush->iSolidColor); + } + else + { + Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, + SrcColorTranslation); - NewColor = - RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), - (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), - (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); - - Background = XLATEOBJ_iXlate(ColorTranslation, NewColor); - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, Background); - } - } - lMask++; - } - tMask += Mask->lDelta; - } + NewColor = + RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), + (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), + (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); + + Background = XLATEOBJ_iXlate(ColorTranslation, NewColor); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( + Dest, DestRect->left + i, DestRect->top + j, Background); + } + } + lMask++; + } + tMask += Mask->lDelta; + } return TRUE; } else { - return FALSE; + return FALSE; } } @@ -918,7 +915,7 @@ InputRect.bottom = DestRect->bottom - DestRect->top; } - if (! IntEngEnter(&EnterLeaveSource, NULL, &InputRect, TRUE, &Translate, &InputObj)) + if (! IntEngEnter(&EnterLeaveSource, DestObj, &InputRect, TRUE, &Translate, &InputObj)) { return FALSE; } @@ -1004,7 +1001,8 @@ &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin); else Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC); + &OutputRect, &InputPoint, MaskOrigin, Brush, &AdjustedBrushOrigin, + R4_MASK); break; case DC_RECT: // Clip the blt to the clip rectangle @@ -1020,7 +1018,7 @@ &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); else Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC); + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); break; case DC_COMPLEX: Ret = TRUE; @@ -1058,7 +1056,7 @@ &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin) && Ret; else Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, - &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, 0xAACC) && Ret; + &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK) && Ret; } } while(EnumMore); @@ -1069,26 +1067,20 @@ IntEngLeave(&EnterLeaveDest); IntEngLeave(&EnterLeaveSource); - /* Dummy BitBlt to let driver know that something has changed. - 0x00AA0029 is the Rop for D (no-op) */ - /* FIXME: Remove the typecast! */ - IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation, - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, ROP_NOOP); - return Ret; } BOOL STDCALL IntEngMaskBlt(SURFOBJ *DestObj, - SURFOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *DestColorTranslation, - XLATEOBJ *SourceColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *Brush, - POINTL *BrushOrigin) + SURFOBJ *Mask, + CLIPOBJ *ClipRegion, + XLATEOBJ *DestColorTranslation, + XLATEOBJ *SourceColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint, + POINTL *MaskOrigin, + BRUSHOBJ *Brush, + POINTL *BrushOrigin) { BOOLEAN ret; RECTL OutputRect; @@ -1123,9 +1115,21 @@ MouseSafetyOnDrawStart(DestObj, OutputRect.left, OutputRect.top, OutputRect.right, OutputRect.bottom); + /* Dummy BitBlt to let driver know that it should flush its changes. + This should really be done using a call to DrvSynchronizeSurface, + but the VMware driver doesn't hook that call. */ + /* FIXME: Remove the typecast! */ + IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, R4_NOOP); + ret = EngMaskBitBlt(DestObj, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation, &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin); + /* Dummy BitBlt to let driver know that something has changed. */ + /* FIXME: Remove the typecast! */ + IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, R4_NOOP); + MouseSafetyOnDrawEnd(DestObj); return ret; _____ Modified: trunk/reactos/subsys/win32k/eng/copybits.c --- trunk/reactos/subsys/win32k/eng/copybits.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/eng/copybits.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -98,7 +98,7 @@ /* FIXME: Remove the typecast! */ ret = IntEngBitBlt((BITMAPOBJ*)Dest, (BITMAPOBJ*)Source, NULL, Clip, ColorTranslation, DestRect, SourcePoint, - NULL, NULL, NULL, 0); + NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); MouseSafetyOnDrawEnd(Dest); MouseSafetyOnDrawEnd(Source); _____ Modified: trunk/reactos/subsys/win32k/eng/gradient.c --- trunk/reactos/subsys/win32k/eng/gradient.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/eng/gradient.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -541,7 +541,7 @@ pco->rclBounds.top, pco->rclBounds.right, pco->rclBounds.bottom); - if((psoDest->iType != STYPE_BITMAP) && (pboDest->flHooks & HOOK_GRADIENTFILL)) + if(pboDest->flHooks & HOOK_GRADIENTFILL) { Ret = GDIDEVFUNCS(psoDest).GradientFill( psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, @@ -551,19 +551,6 @@ } Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); - if(Ret) - { - /* Dummy BitBlt to let driver know that something has changed. - 0x00AA0029 is the Rop for D (no-op) */ - if(pboDest->flHooks & HOOK_BITBLT) - { - GDIDEVFUNCS(psoDest).BitBlt( - psoDest, NULL, NULL, pco, pxlo, - prclExtents, pptlDitherOrg, NULL, NULL, NULL, ROP_NOOP); - MouseSafetyOnDrawEnd(psoDest); - return TRUE; - } - } MouseSafetyOnDrawEnd(psoDest); return Ret; } _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -178,7 +178,7 @@ if((MaskSurface = EngLockSurface(pgp->MaskSurface))) { EngBitBlt(DestSurface, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, SRCCOPY); + &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); EngUnlockSurface(MaskSurface); } EngUnlockSurface(SaveSurface); @@ -231,7 +231,7 @@ DestSurface->sizlBitmap.cy - pt.y); EngBitBlt(SaveSurface, DestSurface, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCCOPY); + &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); EngUnlockSurface(SaveSurface); } @@ -265,17 +265,17 @@ if((ColorSurf = EngLockSurface(pgp->ColorSurface))) { EngBitBlt(DestSurface, ColorSurf, MaskSurf, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, 0xAACC); + &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, R4_MASK); EngUnlockSurface(ColorSurf); } } else { EngBitBlt(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCAND); + &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCAND)); SrcPoint.y += pgp->Size.cy; EngBitBlt(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, SRCINVERT); + &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCINVERT)); } EngUnlockSurface(MaskSurf); } _____ Modified: trunk/reactos/subsys/win32k/eng/transblt.c --- trunk/reactos/subsys/win32k/eng/transblt.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/eng/transblt.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -270,18 +270,6 @@ &OutputRect, SourceRect, iTransColor, Reserved); } - if(Ret) - { - /* Dummy BitBlt to let driver know that something has changed. - 0x00AA0029 is the Rop for D (no-op) */ - if (DestObj->flHooks & HOOK_BITBLT) - { - GDIDEVFUNCS(DestSurf).BitBlt( - DestSurf, NULL, NULL, Clip, ColorTranslation, - &OutputRect, NULL, NULL, NULL, NULL, ROP_NOOP); - } - } - MouseSafetyOnDrawEnd(DestSurf); if(SourceSurf != DestSurf) { _____ Modified: trunk/reactos/subsys/win32k/include/inteng.h --- trunk/reactos/subsys/win32k/include/inteng.h 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/include/inteng.h 2005-02-06 18:27:06 UTC (rev 13445) @@ -18,8 +18,18 @@ ULONG Width; } SPAN, *PSPAN; -#define ROP_NOOP 0x00AA0029 +#define R3_OPINDEX_SRCCOPY 0xcc +#define R3_OPINDEX_NOOP 0xaa +#define R4_NOOP ((R3_OPINDEX_NOOP << 8) | R3_OPINDEX_NOOP) +#define R4_MASK ((R3_OPINDEX_NOOP << 8) | R3_OPINDEX_SRCCOPY) +#define ROP2_TO_MIX(Rop2) (((Rop2) << 8) | (Rop2)) +#define ROP3_USES_SOURCE(Rop3) ((((Rop3) & 0xCC0000) >> 2) != ((Rop3) & 0x330000)) +#define ROP4_USES_SOURCE(Rop4) (((((Rop4) & 0xCC) >> 2) != ((Rop4) & 0x33)) || ((((Rop4) & 0xCC00) >> 2) != ((Rop4) & 0x3300))) +#define ROP3_USES_PATTERN(Rop3) ((((Rop3) & 0xF00000) >> 4) != ((Rop3) & 0x0F0000)) +#define ROP4_USES_PATTERN(Rop4) (((((Rop4) & 0xF0) >> 4) != ((Rop4) & 0x0F)) || ((((Rop4) & 0xF000) >> 4) != ((Rop4) & 0x0F00))) +#define ROP3_TO_ROP4(Rop3) ((((Rop3) >> 8) & 0xff00) | (((Rop3) >> 16) & 0x00ff)) + /* Definitions of IntEngXxx functions */ #define IntEngLockProcessDriverObjs(W32Process) \ @@ -32,7 +42,6 @@ IntEngCleanupDriverObjs(struct _EPROCESS *Process, PW32PROCESS Win32Process); -#define ROP2_TO_MIX(Rop2) (((Rop2) << 8) | (Rop2)) BOOL STDCALL IntEngLineTo(BITMAPOBJ *Surface, CLIPOBJ *Clip, _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -49,8 +49,8 @@ HPALETTE SourcePalette = 0, DestPalette = 0; PGDIBRUSHOBJ BrushObj; GDIBRUSHINST BrushInst; - BOOL UsesSource = ROP_USES_SOURCE(ROP); - BOOL UsesPattern = ROP_USES_PATTERN(ROP); + BOOL UsesSource = ROP3_USES_SOURCE(ROP); + BOOL UsesPattern = ROP3_USES_PATTERN(ROP); DCDest = DC_LockDc(hDCDest); if (NULL == DCDest) @@ -201,7 +201,8 @@ /* Perform the bitblt operation */ Status = IntEngBitBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP); + &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, + &BrushOrigin, ROP3_TO_ROP4(ROP)); if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/objects/brush.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -239,7 +239,7 @@ NULL, &BrushInst.BrushObject, &BrushOrigin, - ROP); + ROP3_TO_ROP4(ROP)); } BITMAPOBJ_UnlockBitmap(dc->w.hBitmap); _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -979,7 +979,7 @@ NULL, &FillBrushInst.BrushObject, NULL, - PATCOPY); + ROP3_TO_ROP4(PATCOPY)); } } _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-02-06 18:24:31 UTC (rev 13444) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-02-06 18:27:06 UTC (rev 13445) @@ -1636,7 +1636,7 @@ &SourcePoint, &BrushBgInst.BrushObject, &BrushOrigin, - PATCOPY); + ROP3_TO_ROP4(PATCOPY)); fuOptions &= ~ETO_OPAQUE; } else @@ -1854,7 +1854,7 @@ &SourcePoint, &BrushBgInst.BrushObject, &BrushOrigin, - PATCOPY); + ROP3_TO_ROP4(PATCOPY)); BackgroundLeft = DestRect.right; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs