Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[fireball] 42031: - Add win32 thread infrastructure. - Cleanup win32 process/thread info structures.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:35:40 2009 New Revision: 42031 URL: http://svn.reactos.org/svn/reactos?rev=42031&view=rev Log: - Add win32 thread infrastructure. - Cleanup win32 process/thread info structures. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -28,7 +28,7 @@ Win32kProcessCallout(PEPROCESS Process, BOOLEAN Create) { - PW32PROCESS Win32Process; + PPROCESSINFO Win32Process; DPRINT("Enter Win32kProcessCallback\n"); @@ -82,23 +82,6 @@ Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; Win32Process->HeapMappings.UserMapping = UserBase; Win32Process->HeapMappings.Count = 1; - - InitializeListHead(&Win32Process->ClassList); - InitializeListHead(&Win32Process->MenuListHead); - InitializeListHead(&Win32Process->PrivateFontListHead); - ExInitializeFastMutex(&Win32Process->PrivateFontListLock); - InitializeListHead(&Win32Process->DriverObjListHead); - ExInitializeFastMutex(&Win32Process->DriverObjListLock); - - if(Process->Peb != NULL) - { - /* map the gdi handle table to user land */ - //Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(GdiTableSection, Process); - //Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; - } - - /* setup process flags */ - Win32Process->W32PF_flags = 0; } else { @@ -114,7 +97,61 @@ Win32kThreadCallout(PETHREAD Thread, PSW32THREADCALLOUTTYPE Type) { - UNIMPLEMENTED; + struct _EPROCESS *Process; + PTHREADINFO Win32Thread; + + DPRINT("Enter Win32kThreadCallback\n"); + + Process = Thread->ThreadsProcess; + + /* Get the Win32 Thread */ + Win32Thread = PsGetThreadWin32Thread(Thread); + + /* Allocate one if needed */ + if (!Win32Thread) + { + /* FIXME - lock the process */ + Win32Thread = ExAllocatePoolWithTag(NonPagedPool, + sizeof(THREADINFO), + TAG('W', '3', '2', 't')); + + if (!Win32Thread) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Win32Thread, sizeof(THREADINFO)); + + PsSetThreadWin32Thread(Thread, Win32Thread); + /* FIXME - unlock the process */ + } + if (Type == PsW32ThreadCalloutInitialize) + { + //PTEB pTeb; + + DPRINT("Creating W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + /*pTeb = NtCurrentTeb(); + if (pTeb) + { + Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; + Win32Thread->pClientInfo->pClientThreadInfo = NULL; + }*/ + } + else + { + DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); + + /*if (Win32Thread->ThreadInfo != NULL) + { + UserHeapFree(Win32Thread->ThreadInfo); + Win32Thread->ThreadInfo = NULL; + }*/ + + PsSetThreadWin32Thread(Thread, NULL); + } + + DPRINT("Leave Win32kThreadCallback\n"); + return STATUS_SUCCESS; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -28,13 +28,13 @@ IN OUT PVOID *CommitAddress, IN OUT PSIZE_T CommitSize) { - PW32PROCESS W32Process; + PPROCESSINFO W32Process; PW32HEAP_USER_MAPPING Mapping; PVOID UserBase = NULL; NTSTATUS Status; SIZE_T Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); - W32Process = PsGetCurrentProcessWin32Process(); + W32Process = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); if (W32Process != NULL) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -77,7 +77,7 @@ static __inline PVOID UserHeapAddressToUser(PVOID lpMem) { - PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + PPROCESSINFO W32Process = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + (ULONG_PTR)W32Process->HeapMappings.UserMapping); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Jul 18 11:35:40 2009 @@ -4,54 +4,15 @@ typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; #include <pshpack1.h> -// FIXME! Move to ntuser.h -typedef struct _TL -{ - struct _TL* next; - PVOID pobj; - PVOID pfnFree; -} TL, *PTL; - typedef struct _W32THREAD { PETHREAD pEThread; - ULONG RefCount; - PTL ptlW32; - PVOID pgdiDcattr; - PVOID pgdiBrushAttr; - PVOID pUMPDObjs; - PVOID pUMPDHeap; - DWORD dwEngAcquireCount; - PVOID pSemTable; - PVOID pUMPDObj; } W32THREAD, *PW32THREAD; typedef struct _THREADINFO { W32THREAD W32Thread; - PTL ptl; PVOID ppi; // FIXME: use PPROCESSINFO - struct _USER_MESSAGE_QUEUE* MessageQueue; - struct _KBL* KeyboardLayout; - PCLIENTTHREADINFO pcti; - struct _DESKTOP* Desktop; - //PDESKTOPINFO pDeskInfo; - //PCLIENTINFO pClientInfo; - FLONG TIF_flags; - LONG timeLast; - HANDLE hDesktop; - UINT cPaintsReady; /* Count of paints pending. */ - UINT cTimersReady; /* Count of timers pending. */ - ULONG fsHooks; - LIST_ENTRY PtiLink; - - CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. - - LIST_ENTRY WindowListHead; - LIST_ENTRY W32CallbackListHead; - BOOLEAN IsExiting; - SINGLE_LIST_ENTRY ReferencesList; - PW32THREADINFO ThreadInfo; } THREADINFO, *PTHREADINFO; #include <poppack.h> @@ -65,45 +26,10 @@ ULONG Count; } W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; -typedef struct _W32PROCESS +typedef struct _PROCESSINFO { PEPROCESS peProcess; - DWORD RefCount; - ULONG W32PF_flags; - PKEVENT InputIdleEvent; - DWORD StartCursorHideTime; - DWORD NextStart; - PVOID pDCAttrList; - PVOID pBrushAttrList; - DWORD W32Pid; - LONG GDIHandleCount; - LONG UserHandleCount; - DWORD cSimpleLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ - LIST_ENTRY leDCAttrList; - LIST_ENTRY leObjAttrList; -/* ReactOS */ - LIST_ENTRY ClassList; - LIST_ENTRY MenuListHead; - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct _KBL* KeyboardLayout; W32HEAP_USER_MAPPING HeapMappings; -} W32PROCESS, *PW32PROCESS; - -typedef struct _PROCESSINFO -{ - W32PROCESS XzyxW32Process; /* Place holder. */ - /* ReactOS */ - HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; - - UINT RegisteredSysClasses : 1; - -} PROCESSINFO; +} PROCESSINFO, *PPROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */

1 0

[fireball] 42030: - Add basic Win32k infrastructure: W32PROCESS and W32THREAD, global user heap.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:34:22 2009 New Revision: 42030 URL: http://svn.reactos.org/svn/reactos?rev=42030&view=rev Log: - Add basic Win32k infrastructure: W32PROCESS and W32THREAD, global user heap. Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/err.c (with props) branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c (with props) branches/arwinss/reactos/subsystems/win32/win32k/include/error.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c (with props) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/err.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/err.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/err.c [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,82 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: err.c 37752 2008-11-29 22:48:58Z sginsberg $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Errors + * FILE: subsys/win32k/misc/error.c + * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * REVISION HISTORY: + * 06-06-2001 CSH Created + */ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> + +VOID FASTCALL +SetLastNtError(NTSTATUS Status) +{ + SetLastWin32Error(RtlNtStatusToDosError(Status)); +} + +VOID FASTCALL +SetLastWin32Error(DWORD Status) +{ + PTEB Teb = PsGetCurrentThread()->Tcb.Teb; + + if (NULL != Teb) + { + Teb->LastErrorValue = Status; + } +} + +NTSTATUS FASTCALL +GetLastNtError() +{ + PTEB Teb = PsGetCurrentThread()->Tcb.Teb; + + if ( NULL != Teb ) + { + return Teb->LastStatusValue; + } + return 0; +} + +VOID +APIENTRY +W32kRaiseStatus(NTSTATUS Status) +{ + EXCEPTION_RECORD ExceptionRecord; + + /* Create an exception record */ + ExceptionRecord.ExceptionCode = Status; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 0; + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + + RtlRaiseException(&ExceptionRecord); + + /* If we returned, raise a status */ + W32kRaiseStatus(Status); +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/gre/err.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -13,8 +13,13 @@ /* System service call table */ #include <include/napi.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ + +HANDLE GlobalUserHeap = NULL; +PSECTION_OBJECT GlobalUserHeapSection = NULL; /* PRIVATE FUNCTIONS *********************************************************/ @@ -23,7 +28,84 @@ Win32kProcessCallout(PEPROCESS Process, BOOLEAN Create) { - UNIMPLEMENTED; + PW32PROCESS Win32Process; + + DPRINT("Enter Win32kProcessCallback\n"); + + /* Get the Win32 Process */ + Win32Process = PsGetProcessWin32Process(Process); + + /* Allocate one if needed */ + if (!Win32Process) + { + /* FIXME - lock the process */ + Win32Process = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PROCESSINFO), + TAG('W', '3', '2', 'p')); + + if (!Win32Process) + return STATUS_NO_MEMORY; + + RtlZeroMemory(Win32Process, sizeof(PROCESSINFO)); + + PsSetProcessWin32Process(Process, Win32Process); + /* FIXME - unlock the process */ + } + + if (Create) + { + SIZE_T ViewSize = 0; + LARGE_INTEGER Offset; + PVOID UserBase = NULL; + NTSTATUS Status; + extern PSECTION_OBJECT GlobalUserHeapSection; + DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + + /* map the global heap into the process */ + Offset.QuadPart = 0; + Status = MmMapViewOfSection(GlobalUserHeapSection, + PsGetCurrentProcess(), + &UserBase, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map the global heap! 0x%x\n", Status); + return Status; + } + Win32Process->HeapMappings.Next = NULL; + Win32Process->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; + Win32Process->HeapMappings.UserMapping = UserBase; + Win32Process->HeapMappings.Count = 1; + + InitializeListHead(&Win32Process->ClassList); + InitializeListHead(&Win32Process->MenuListHead); + InitializeListHead(&Win32Process->PrivateFontListHead); + ExInitializeFastMutex(&Win32Process->PrivateFontListLock); + InitializeListHead(&Win32Process->DriverObjListHead); + ExInitializeFastMutex(&Win32Process->DriverObjListLock); + + if(Process->Peb != NULL) + { + /* map the gdi handle table to user land */ + //Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(GdiTableSection, Process); + //Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; + } + + /* setup process flags */ + Win32Process->W32PF_flags = 0; + } + else + { + DPRINT("Destroying W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); + } + + DPRINT("Leave Win32kProcessCallback\n"); return STATUS_SUCCESS; } @@ -164,6 +246,7 @@ PUNICODE_STRING RegistryPath) { WIN32_CALLOUTS_FPNS CalloutData; + PVOID GlobalUserHeapBase = NULL; DPRINT1("Win32k initialization: DO %p, RegPath %wZ\n", DriverObject, RegistryPath); @@ -201,5 +284,15 @@ /* Register them */ PsEstablishWin32Callouts(&CalloutData); - return STATUS_SUCCESS; -} + /* Create global heap */ + GlobalUserHeap = UserCreateHeap(&GlobalUserHeapSection, + &GlobalUserHeapBase, + 1 * 1024 * 1024); /* FIXME - 1 MB for now... */ + if (GlobalUserHeap == NULL) + { + DPRINT1("Failed to initialize the global heap!\n"); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,216 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> + + +static NTSTATUS APIENTRY +IntUserHeapCommitRoutine(IN PVOID Base, + IN OUT PVOID *CommitAddress, + IN OUT PSIZE_T CommitSize) +{ + PW32PROCESS W32Process; + PW32HEAP_USER_MAPPING Mapping; + PVOID UserBase = NULL; + NTSTATUS Status; + SIZE_T Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); + + W32Process = PsGetCurrentProcessWin32Process(); + + if (W32Process != NULL) + { + /* search for the mapping */ + Mapping = &W32Process->HeapMappings; + while (Mapping != NULL) + { + if (Mapping->KernelMapping == Base) + { + UserBase = Mapping->UserMapping; + break; + } + + Mapping = Mapping->Next; + } + + ASSERT(UserBase != NULL); + } + else + { + SIZE_T ViewSize = 0; + LARGE_INTEGER Offset; + extern PSECTION_OBJECT GlobalUserHeapSection; + + /* HACK: This needs to be handled during startup only... */ + ASSERT(Base == (PVOID)GlobalUserHeap); + + /* temporarily map it into user space */ + Offset.QuadPart = 0; + Status = MmMapViewOfSection(GlobalUserHeapSection, + PsGetCurrentProcess(), + &UserBase, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + + if (!NT_SUCCESS(Status)) + return Status; + } + + /* commit! */ + UserBase = (PVOID)((ULONG_PTR)UserBase + Delta); + + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &UserBase, + 0, + CommitSize, + MEM_COMMIT, + PAGE_EXECUTE_READ); + if (NT_SUCCESS(Status)) + { + *CommitAddress = (PVOID)((ULONG_PTR)UserBase + Delta); + } + + if (W32Process == NULL) + { + MmUnmapViewOfSection(PsGetCurrentProcess(), + UserBase); + } + + return Status; +} + +static PWIN32HEAP +IntUserHeapCreate(IN PSECTION_OBJECT SectionObject, + IN PVOID *SystemMappedBase, + IN ULONG HeapSize) +{ + PVOID MappedView = NULL; + LARGE_INTEGER Offset; + SIZE_T ViewSize = PAGE_SIZE; + RTL_HEAP_PARAMETERS Parameters = {0}; + PVOID pHeap; + NTSTATUS Status; + + Offset.QuadPart = 0; + + /* Commit the first page before creating the heap! */ + Status = MmMapViewOfSection(SectionObject, + PsGetCurrentProcess(), + &MappedView, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + if (!NT_SUCCESS(Status)) + return NULL; + + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &MappedView, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + + MmUnmapViewOfSection(PsGetCurrentProcess(), + MappedView); + + if (!NT_SUCCESS(Status)) + return NULL; + + /* Create the heap, don't serialize in kmode! The caller is responsible + to synchronize the heap! */ + Parameters.Length = sizeof(Parameters); + Parameters.InitialCommit = ViewSize; + Parameters.InitialReserve = (SIZE_T)HeapSize; + Parameters.CommitRoutine = IntUserHeapCommitRoutine; + + pHeap = RtlCreateHeap(HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, + *SystemMappedBase, + (SIZE_T)HeapSize, + ViewSize, + NULL, + &Parameters); + + return pHeap; +} + +PWIN32HEAP +UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, + IN OUT PVOID *SystemBase, + IN SIZE_T HeapSize) +{ + LARGE_INTEGER SizeHeap; + PWIN32HEAP pHeap = NULL; + NTSTATUS Status; + + SizeHeap.QuadPart = HeapSize; + + /* create the section and map it into session space */ + Status = MmCreateSection((PVOID*)SectionObject, + SECTION_ALL_ACCESS, + NULL, + &SizeHeap, + PAGE_EXECUTE_READWRITE, /* would prefer PAGE_READWRITE, but thanks to RTL heaps... */ + SEC_RESERVE, + NULL, + NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + Status = MmMapViewInSystemSpace(*SectionObject, + SystemBase, + &HeapSize); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(*SectionObject); + *SectionObject = NULL; + + SetLastNtError(Status); + return FALSE; + } + + /* create the heap */ + pHeap = IntUserHeapCreate(*SectionObject, + SystemBase, + HeapSize); + + if (pHeap == NULL) + { + ObDereferenceObject(*SectionObject); + *SectionObject = NULL; + + SetLastNtError(STATUS_UNSUCCESSFUL); + } + + return pHeap; +} Propchange: branches/arwinss/reactos/subsystems/win32/win32k/gre/usrheap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/subsystems/win32/win32k/include/error.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/error.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/error.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,17 @@ +#ifndef _WIN32K_ERROR_H +#define _WIN32K_ERROR_H + +VOID FASTCALL +SetLastNtError( + NTSTATUS Status); + +VOID FASTCALL +SetLastWin32Error( + DWORD Status); + +NTSTATUS FASTCALL +GetLastNtError(); + +#endif /* _WIN32K_ERROR_H */ + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/error.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,85 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32K + * FILE: subsystems/win32/win32k/include/heap.h + * PURPOSE: Global user heap + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> + */ + +#ifndef _INCLUDE_GLOBAL_HEAP_H +#define _INCLUDE_GLOBAL_HEAP_H + +extern HANDLE GlobalUserHeap; + +PWIN32HEAP +UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, + IN OUT PVOID *SystemBase, + IN SIZE_T HeapSize); + +static __inline PVOID +UserHeapAlloc(SIZE_T Bytes) +{ + return RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); +} + +static __inline BOOL +UserHeapFree(PVOID lpMem) +{ + return RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); +} + +static __inline PVOID +UserHeapReAlloc(PVOID lpMem, + SIZE_T Bytes) +{ +#if 0 + /* NOTE: ntoskrnl doesn't export RtlReAllocateHeap... */ + return RtlReAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem, + Bytes); +#else + SIZE_T PrevSize; + PVOID pNew; + + PrevSize = RtlSizeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + + if (PrevSize == Bytes) + return lpMem; + + pNew = RtlAllocateHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + Bytes); + if (pNew != NULL) + { + if (PrevSize < Bytes) + Bytes = PrevSize; + + RtlCopyMemory(pNew, + lpMem, + Bytes); + + RtlFreeHeap(GlobalUserHeap, + HEAP_NO_SERIALIZE, + lpMem); + } + + return pNew; +#endif +} + +static __inline PVOID +UserHeapAddressToUser(PVOID lpMem) +{ + PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); + return (PVOID)(((ULONG_PTR)lpMem - (ULONG_PTR)GlobalUserHeap) + + (ULONG_PTR)W32Process->HeapMappings.UserMapping); +} + +#endif Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/heap.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,109 @@ +#ifndef __INCLUDE_NAPI_WIN32_H +#define __INCLUDE_NAPI_WIN32_H + +typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; + +#include <pshpack1.h> +// FIXME! Move to ntuser.h +typedef struct _TL +{ + struct _TL* next; + PVOID pobj; + PVOID pfnFree; +} TL, *PTL; + +typedef struct _W32THREAD +{ + PETHREAD pEThread; + ULONG RefCount; + PTL ptlW32; + PVOID pgdiDcattr; + PVOID pgdiBrushAttr; + PVOID pUMPDObjs; + PVOID pUMPDHeap; + DWORD dwEngAcquireCount; + PVOID pSemTable; + PVOID pUMPDObj; +} W32THREAD, *PW32THREAD; + +typedef struct _THREADINFO +{ + W32THREAD W32Thread; + PTL ptl; + PVOID ppi; // FIXME: use PPROCESSINFO + struct _USER_MESSAGE_QUEUE* MessageQueue; + struct _KBL* KeyboardLayout; + PCLIENTTHREADINFO pcti; + struct _DESKTOP* Desktop; + //PDESKTOPINFO pDeskInfo; + //PCLIENTINFO pClientInfo; + FLONG TIF_flags; + LONG timeLast; + HANDLE hDesktop; + UINT cPaintsReady; /* Count of paints pending. */ + UINT cTimersReady; /* Count of timers pending. */ + ULONG fsHooks; + LIST_ENTRY PtiLink; + + CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. + + LIST_ENTRY WindowListHead; + LIST_ENTRY W32CallbackListHead; + BOOLEAN IsExiting; + SINGLE_LIST_ENTRY ReferencesList; + PW32THREADINFO ThreadInfo; +} THREADINFO, *PTHREADINFO; + +#include <poppack.h> + +typedef struct _W32HEAP_USER_MAPPING +{ + struct _W32HEAP_USER_MAPPING *Next; + PVOID KernelMapping; + PVOID UserMapping; + ULONG_PTR Limit; + ULONG Count; +} W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; + +typedef struct _W32PROCESS +{ + PEPROCESS peProcess; + DWORD RefCount; + ULONG W32PF_flags; + PKEVENT InputIdleEvent; + DWORD StartCursorHideTime; + DWORD NextStart; + PVOID pDCAttrList; + PVOID pBrushAttrList; + DWORD W32Pid; + LONG GDIHandleCount; + LONG UserHandleCount; + DWORD cSimpleLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE rtlAvlTable; /* Process AVL Table. */ + LIST_ENTRY leDCAttrList; + LIST_ENTRY leObjAttrList; +/* ReactOS */ + LIST_ENTRY ClassList; + LIST_ENTRY MenuListHead; + FAST_MUTEX PrivateFontListLock; + LIST_ENTRY PrivateFontListHead; + FAST_MUTEX DriverObjListLock; + LIST_ENTRY DriverObjListHead; + struct _KBL* KeyboardLayout; + W32HEAP_USER_MAPPING HeapMappings; +} W32PROCESS, *PW32PROCESS; + +typedef struct _PROCESSINFO +{ + W32PROCESS XzyxW32Process; /* Place holder. */ + /* ReactOS */ + HINSTANCE hModUser; + PWINDOWCLASS LocalClassList; + PWINDOWCLASS GlobalClassList; + PWINDOWCLASS SystemClassList; + + UINT RegisteredSysClasses : 1; + +} PROCESSINFO; + +#endif /* __INCLUDE_NAPI_WIN32_H */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -11,9 +11,9 @@ /* Version Data */ #undef __MSVCRT__ #include <psdk/ntverp.h> -//#define _WIN32_WINNT _WIN32_WINNT_WS03 +#define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1 -//#define WINVER 0x600 +#define WINVER 0x600 /* Initial DDK/IFS Headers */ #ifdef _MSC_VER @@ -54,21 +54,21 @@ #include <ntndk.h> /* SEH Support with PSEH */ -#include <pseh/pseh2.h> +#include <pseh/pseh.h> /* CSRSS Header */ #include <csrss/csrss.h> /* Helper Header */ -//#include <reactos/helper.h> +#include <reactos/helper.h> /* Probe and capture */ -//#include <reactos/probe.h> +#include <reactos/probe.h> /* Public Win32K Headers */ #include <win32k/callback.h> #include <win32k/ntusrtyp.h> -//#include <win32k/ntuser.h> +#include <win32k/ntuser.h> #include <win32k/ntgdityp.h> #include <win32k/ntgdihdl.h> #define LANGPACK Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Win32K * FILE: subsystems/win32/win32k/include/win32kp.h * PURPOSE: Internal Win32K Header - * PROGRAMMER: Stefan Ginsberg (stefan__100__(a)hotmail.com) + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ #ifndef _INCLUDE_INTERNAL_WIN32K_H @@ -15,10 +15,12 @@ W32KAPI UINT APIENTRY wine_server_call(void *req_ptr); /* Internal Win32K Headers */ +#include <error.h> #include <wine/server_protocol.h> -//#include <gdiobj.h> -//#include <engobj.h> -//#include <userobj.h> +#include <win32.h> +#include <heap.h> + +#include "winesup.h" /* client communication functions (from server.h) */ struct __server_iovec @@ -41,5 +43,4 @@ struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; - #endif Added: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,66 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32K + * FILE: subsystems/win32/win32k/include/winesup.h + * PURPOSE: Wine supporting functions + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> + */ + +#ifndef _INCLUDE_INTERNAL_WINESUP_H +#define _INCLUDE_INTERNAL_WINESUP_H + +/* INCLUDES ******************************************************************/ + +#define assert ASSERT +#define tolowerW(n) towlower((n)) +#define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) + +void set_error( unsigned int err ); +static inline void clear_error(void) { set_error(0); } + +/* gets the discretionary access control list from a security descriptor */ +static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int *present ) +{ + *present = (sd->control & SE_DACL_PRESENT ? TRUE : FALSE); + + if (sd->dacl_len) + return (const ACL *)((const char *)(sd + 1) + + sd->owner_len + sd->group_len + sd->sacl_len); + else + return NULL; +} + +/* gets the system access control list from a security descriptor */ +static inline const ACL *sd_get_sacl( const struct security_descriptor *sd, int *present ) +{ + *present = (sd->control & SE_SACL_PRESENT ? TRUE : FALSE); + + if (sd->sacl_len) + return (const ACL *)((const char *)(sd + 1) + + sd->owner_len + sd->group_len); + else + return NULL; +} + +/* gets the owner from a security descriptor */ +static inline const SID *sd_get_owner( const struct security_descriptor *sd ) +{ + if (sd->owner_len) + return (const SID *)(sd + 1); + else + return NULL; +} + +/* gets the primary group from a security descriptor */ +static inline const SID *sd_get_group( const struct security_descriptor *sd ) +{ + if (sd->group_len) + return (const SID *)((const char *)(sd + 1) + sd->owner_len); + else + return NULL; +} + +int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); +const SID *token_get_user( void *token ); + +#endif Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -17,11 +17,16 @@ <pch>win32k.h</pch> </directory> <directory name="gre"> + <file>err.c</file> <file>init.c</file> + <file>usrheap.c</file> </directory> <directory name="wine"> + <file>class.c</file> <file>main.c</file> + <file>object.c</file> <file>stubs.c</file> + <file>winesup.c</file> </directory> <file>win32k.rc</file> </module> Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Sat Jul 18 11:34:22 2009 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/wine/winesup.c + * PURPOSE: Wine supporting functions + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +void set_error( unsigned int err ) +{ +} + +const SID *token_get_user( void *token ) +{ + return NULL; +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 42029: - Stub all Wine server calls as UNIMPLEMENTED.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:30:26 2009 New Revision: 42029 URL: http://svn.reactos.org/svn/reactos?rev=42029&view=rev Log: - Stub all Wine server calls as UNIMPLEMENTED. Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c (with props) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Jul 18 11:30:26 2009 @@ -15,9 +15,31 @@ W32KAPI UINT APIENTRY wine_server_call(void *req_ptr); /* Internal Win32K Headers */ +#include <wine/server_protocol.h> //#include <gdiobj.h> //#include <engobj.h> //#include <userobj.h> +/* client communication functions (from server.h) */ +struct __server_iovec +{ + const void *ptr; + data_size_t size; +}; + +#define __SERVER_MAX_DATA 5 + +struct __server_request_info +{ + union + { + union generic_request req; /* request structure */ + union generic_reply reply; /* reply structure */ + } u; + unsigned int data_count; /* count of request data pointers */ + void *reply_data; /* reply data pointer */ + struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ +}; + #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Jul 18 11:30:26 2009 @@ -21,6 +21,7 @@ </directory> <directory name="wine"> <file>main.c</file> + <file>stubs.c</file> </directory> <file>win32k.rc</file> </module> Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Sat Jul 18 11:30:26 2009 @@ -10,6 +10,9 @@ #include <win32k.h> +#define WANT_REQUEST_HANDLERS +#include "request.h" + #define NDEBUG #include <debug.h> @@ -19,5 +22,27 @@ APIENTRY wine_server_call(void *req_ptr) { + struct __server_request_info *reqinfo = req_ptr; + //struct type##_request * const req = &__req.u.req.type##_request; + //const struct type##_reply * const reply = &__req.u.reply.type##_reply; + + union generic_reply reply; + enum request req = reqinfo->u.req.request_header.req; + + DPRINT("WineServer call of type 0x%x\n", req); + + memset( &reply, 0, sizeof(reply) ); + + //if (debug_level) trace_request(); + + if (req < REQ_NB_REQUESTS) + req_handlers[req]( req_ptr, &reply ); + else + DPRINT1("WineServer call of type 0x%x is not implemented!\n", req); + + //reply.reply_header.error = current->error; + //reply.reply_header.reply_size = current->reply_size; + //if (debug_level) trace_reply( req, &reply ); + return 0; } Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] Sat Jul 18 11:30:26 2009 @@ -1,0 +1,1210 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/wine/stubs.c + * PURPOSE: Wine server stubs + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> + +#include "request.h" + +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +DECL_HANDLER(new_process) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_new_process_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(new_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_startup_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(init_process_done) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(init_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(terminate_process) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(terminate_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_process_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_process_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_thread_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_thread_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_dll_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(suspend_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(resume_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(load_dll) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(unload_dll) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(queue_apc) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_apc_result) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(close_handle) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_handle_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(dup_handle) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_process) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(select) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(event_op) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_mutex) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(release_mutex) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_mutex) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_semaphore) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(release_semaphore) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_semaphore) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_file) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_file_object) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(alloc_file_handle) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_handle_fd) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(flush_file) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(lock_file) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(unlock_file) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_socket) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(accept_socket) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_socket_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_socket_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(enable_socket_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_socket_deferred) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(alloc_console) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(free_console) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_renderer_events) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_console) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_wait_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_mode) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_console_mode) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_console_input_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_input_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(append_console_input_history) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_input_history) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_console_output) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_console_output_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_console_output_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(write_console_input) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(read_console_input) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(write_console_output) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(fill_console_output) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(read_console_output) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(move_console_output) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(send_console_signal) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(read_directory_changes) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(read_change) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_mapping) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_mapping) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_mapping_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_mapping_committed_range) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(add_mapping_committed_range) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_snapshot) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(next_process) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(next_thread) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(wait_debug_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(queue_exception_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_exception_status) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(output_debug_string) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(continue_debug_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(debug_process) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(debug_break) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_debugger_kill_on_exit) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(read_process_memory) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(write_process_memory) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_key) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_key) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(delete_key) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(flush_key) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(enum_key) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_key_value) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_key_value) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(enum_key_value) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(delete_key_value) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(load_registry) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(unload_registry) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(save_registry) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_registry_notification) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(cancel_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_timer_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_thread_context) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_thread_context) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_selector_entry) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(add_atom) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(delete_atom) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(find_atom) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_atom_information) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_atom_information) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(empty_atom_table) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(init_atom_table) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_msg_queue) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_queue_fd) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_queue_mask) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_queue_status) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_process_idle_event) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(send_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(post_quit_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(send_hardware_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(reply_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(accept_hardware_message) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_message_reply) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_win_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(kill_win_timer) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(is_window_hung) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_serial_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_serial_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(register_async) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(cancel_async) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(ioctl) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_ioctl_result) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_named_pipe) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_named_pipe_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(destroy_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_desktop_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_owner) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_parent) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_parents) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_children) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_children_from_point) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_tree) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_pos) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_rectangles) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_text) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_text) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_windows_offset) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_visible_region) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_region) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_region) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_update_region) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(update_window_zorder) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(redraw_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_property) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(remove_window_property) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_property) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_properties) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(close_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_process_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_process_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(enum_winstation) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(close_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_thread_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_thread_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(enum_desktop) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_user_object_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(attach_thread_input) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_thread_input) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_last_input_time) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_key_state) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_key_state) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_foreground_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_focus_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_active_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_capture_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_caret_window) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_caret_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_hook) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(remove_hook) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(start_hook_chain) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(finish_hook_chain) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_hook_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_class) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(destroy_class) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_class_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_clipboard_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_token) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_global_windows) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(adjust_token_privileges) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_privileges) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(check_token_privileges) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(duplicate_token) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(access_check) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_user) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_groups) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_default_dacl) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_token_default_dacl) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_security_object) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_security_object) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_mailslot) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_mailslot_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_directory) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_directory) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_directory_entry) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_symlink) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_symlink) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(query_symlink) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_object_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(unlink_object) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_impersonation_level) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(allocate_locally_unique_id) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_device_manager) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_device) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(delete_device) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_next_device_request) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(make_process_system) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_token_statistics) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(create_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(open_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(add_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(remove_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(query_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_completion_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(add_fd_completion) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(get_window_layered_info) +{ + UNIMPLEMENTED; +} + +DECL_HANDLER(set_window_layered_info) +{ + UNIMPLEMENTED; +} + +/* EOF */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 42028: - Remove unneeded stuff.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:26:43 2009 New Revision: 42028 URL: http://svn.reactos.org/svn/reactos?rev=42028&view=rev Log: - Remove unneeded stuff. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Sat Jul 18 11:26:43 2009 @@ -21,92 +21,12 @@ #ifndef __WINE_SERVER_REQUEST_H #define __WINE_SERVER_REQUEST_H -#include <assert.h> - -#include "thread.h" -#include "wine/server_protocol.h" - /* max request length */ #define MAX_REQUEST_LENGTH 8192 /* request handler definition */ #define DECL_HANDLER(name) \ void req_##name( const struct name##_request *req, struct name##_reply *reply ) - -/* request functions */ - -#ifdef __GNUC__ -extern void fatal_protocol_error( struct thread *thread, - const char *err, ... ) __attribute__((format (printf,2,3))); -extern void fatal_protocol_perror( struct thread *thread, - const char *err, ... ) __attribute__((format (printf,2,3))); -extern void fatal_error( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); -extern void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); -#else -extern void fatal_protocol_error( struct thread *thread, const char *err, ... ); -extern void fatal_protocol_perror( struct thread *thread, const char *err, ... ); -extern void fatal_error( const char *err, ... ); -extern void fatal_perror( const char *err, ... ); -#endif - -extern const char *get_config_dir(void); -extern void *set_reply_data_size( data_size_t size ); -extern int receive_fd( struct process *process ); -extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); -extern void read_request( struct thread *thread ); -extern void write_reply( struct thread *thread ); -extern unsigned int get_tick_count(void); -extern void open_master_socket(void); -extern void close_master_socket( timeout_t timeout ); -extern void shutdown_master_socket(void); -extern int wait_for_lock(void); -extern int kill_lock_owner( int sig ); -extern int server_dir_fd, config_dir_fd; - -extern void trace_request(void); -extern void trace_reply( enum request req, const union generic_reply *reply ); - -/* get the request vararg data */ -static inline const void *get_req_data(void) -{ - return current->req_data; -} - -/* get the request vararg size */ -static inline data_size_t get_req_data_size(void) -{ - return current->req.request_header.request_size; -} - -/* get the request vararg as unicode string */ -static inline void get_req_unicode_str( struct unicode_str *str ) -{ - str->str = get_req_data(); - str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); -} - -/* get the reply maximum vararg size */ -static inline data_size_t get_reply_max_size(void) -{ - return current->req.request_header.reply_size; -} - -/* allocate and fill the reply data */ -static inline void *set_reply_data( const void *data, data_size_t size ) -{ - void *ret = set_reply_data_size( size ); - if (ret) memcpy( ret, data, size ); - return ret; -} - -/* set the reply data pointer directly (will be freed by request code) */ -static inline void set_reply_data_ptr( void *data, data_size_t size ) -{ - assert( size <= get_reply_max_size() ); - current->reply_size = size; - current->reply_data = data; -} - /* Everything below this line is generated automatically by tools/make_requests */ /* ### make_requests begin ### */

1 0

[fireball] 42027: - Copy request.h header from Wine server to win32k private headers. - Fix server protocol include header.
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 11:25:25 2009 New Revision: 42027 URL: http://svn.reactos.org/svn/reactos?rev=42027&view=rev Log: - Copy request.h header from Wine server to win32k private headers. - Fix server protocol include header. Added: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (with props) branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c (with props) Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Added: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Added: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

1 0

[fireball] 42026: - Add a temporary hack to SwitchDesktop. - Temporary disable saving system parameters to the registry. It seems to do it wrong. - Add a native assert implementation, this was the last bit which fixed MSVCRT-linkage completely. - Disable TRY/FINALLY block in menu.c since it has perverted syntax. - Don't use errno. - Use _snprintf instead of snprintf. - Get rid of imm32.dll dependency by #if0-defining a block of code (a debug mark is put there instead). - Implement PrivateCsrssIn
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 10:50:27 2009 New Revision: 42026 URL: http://svn.reactos.org/svn/reactos?rev=42026&view=rev Log: - Add a temporary hack to SwitchDesktop. - Temporary disable saving system parameters to the registry. It seems to do it wrong. - Add a native assert implementation, this was the last bit which fixed MSVCRT-linkage completely. - Disable TRY/FINALLY block in menu.c since it has perverted syntax. - Don't use errno. - Use _snprintf instead of snprintf. - Get rid of imm32.dll dependency by #if0-defining a block of code (a debug mark is put there instead). - Implement PrivateCsrssInitialized. - Fix a warning. - 16bit -> 32bit in cursoricon.c, resource.c (accelerators). - Return success in RegisterServiceProcess. - Disable debug print in USER_CheckNotLock. - Get rid of another 16 bit history and move on to using Heap[Alloc/Realloc/Free] instead of the old Local* functions (user_private.h). - Make ClientThreadSetup and UpdatePerUserSystemParameters stubs returning success. - Remove more unneeded 16 bit crap from winproc.c. - Fix user32 exports so it loads on Windows 2003. Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/driver.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/resource.c branches/arwinss/reactos/dll/win32/user32/spy.c branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/user32.rbuild branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/user32/user_private.h branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/user32/winproc.c Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -666,7 +666,7 @@ INT width, INT height, UINT cFlag ) { - HGLOBAL16 hObj; + HGLOBAL hObj; static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ @@ -822,13 +822,13 @@ sizeXor = bmpXor.bmHeight * bmpXor.bmWidthBytes; sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes; - hObj = GlobalAlloc16( GMEM_MOVEABLE, + hObj = GlobalAlloc( GMEM_MOVEABLE, sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { CURSORICONINFO *info; - info = GlobalLock16( hObj ); + info = GlobalLock( hObj ); info->ptHotSpot.x = hotspot.x; info->ptHotSpot.y = hotspot.y; info->nWidth = bmpXor.bmWidth; @@ -841,12 +841,12 @@ GetBitmapBits( hAndBits, sizeAnd, info + 1 ); GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd ); - GlobalUnlock16( hObj ); + GlobalUnlock( hObj ); } DeleteObject( hAndBits ); DeleteObject( hXorBits ); - return HICON_32(hObj); + return hObj; } @@ -1560,7 +1560,7 @@ * the Win95 one exactly, especially the return values, which * depend on the setting of various flags. */ -WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) +WORD WINAPI DestroyIcon32( HGLOBAL handle, UINT16 flags ) { WORD retv; @@ -1568,7 +1568,7 @@ /* Check whether destroying active cursor */ - if ( get_user_thread_info()->cursor == HICON_32(handle) ) + if ( get_user_thread_info()->cursor == handle ) { WARN_(cursor)("Destroying active cursor!\n" ); return FALSE; @@ -1578,7 +1578,7 @@ if ( !(flags & CID_NONSHARED) ) { - INT count = CURSORICON_DelSharedIcon(HICON_32(handle)); + INT count = CURSORICON_DelSharedIcon(handle); if ( count != -1 ) return (flags & CID_WIN32)? TRUE : (count == 0); @@ -1588,7 +1588,7 @@ /* Now assume non-shared cursor/icon */ - retv = GlobalFree16( handle ); + retv = GlobalFree( handle ); return (flags & CID_RESOURCE)? retv : TRUE; } @@ -1597,7 +1597,7 @@ */ BOOL WINAPI DestroyIcon( HICON hIcon ) { - return DestroyIcon32(HICON_16(hIcon), CID_WIN32); + return DestroyIcon32(hIcon, CID_WIN32); } @@ -1606,7 +1606,7 @@ */ BOOL WINAPI DestroyCursor( HCURSOR hCursor ) { - return DestroyIcon32(HCURSOR_16(hCursor), CID_WIN32); + return DestroyIcon32(hCursor, CID_WIN32); } /*********************************************************************** @@ -1691,7 +1691,7 @@ TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon); - if (!(ptr = GlobalLock16(HICON_16(hIcon)))) return FALSE; + if (!(ptr = GlobalLock(hIcon))) return FALSE; if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE; dibLength = ptr->nHeight * get_bitmap_width_bytes( @@ -1750,7 +1750,7 @@ DeleteDC( hMemDC ); if (hXorBits) DeleteObject( hXorBits ); if (hAndBits) DeleteObject( hAndBits ); - GlobalUnlock16(HICON_16(hIcon)); + GlobalUnlock(hIcon); SetTextColor( hdc, oldFg ); SetBkColor( hdc, oldBg ); return TRUE; @@ -1797,8 +1797,8 @@ /* Change the cursor shape only if it is visible */ if (thread_info->cursor_count >= 0) { - USER_Driver->pSetCursor(GlobalLock16(HCURSOR_16(hCursor))); - GlobalUnlock16(HCURSOR_16(hCursor)); + USER_Driver->pSetCursor(GlobalLock(hCursor)); + GlobalUnlock(hCursor); } return hOldCursor; } @@ -1816,8 +1816,8 @@ { if (++thread_info->cursor_count == 0) /* Show it */ { - USER_Driver->pSetCursor(GlobalLock16(HCURSOR_16(thread_info->cursor))); - GlobalUnlock16(HCURSOR_16(thread_info->cursor)); + USER_Driver->pSetCursor(GlobalLock(thread_info->cursor)); + GlobalUnlock(thread_info->cursor); } } else @@ -2060,7 +2060,7 @@ CURSORICONINFO *ciconinfo; INT height; - ciconinfo = GlobalLock16(HICON_16(hIcon)); + ciconinfo = GlobalLock(hIcon); if (!ciconinfo) return FALSE; @@ -2100,7 +2100,7 @@ iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height, 1, 1, ciconinfo + 1); - GlobalUnlock16(HICON_16(hIcon)); + GlobalUnlock(hIcon); return TRUE; } @@ -2112,7 +2112,7 @@ { DIBSECTION bmpXor; BITMAP bmpAnd; - HICON16 hObj; + HICON hObj; int xor_objsize = 0, sizeXor = 0, sizeAnd, planes, bpp; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", @@ -2141,13 +2141,13 @@ sizeAnd = bmpAnd.bmHeight * get_bitmap_width_bytes(bmpAnd.bmWidth, 1); - hObj = GlobalAlloc16( GMEM_MOVEABLE, - sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); + hObj = GlobalAlloc( GMEM_MOVEABLE, + sizeof(CURSORICONINFO) + sizeXor + sizeAnd ); if (hObj) { CURSORICONINFO *info; - info = GlobalLock16( hObj ); + info = GlobalLock( hObj ); /* If we are creating an icon, the hotspot is unused */ if (iconinfo->fIcon) @@ -2256,9 +2256,9 @@ dst_bits, &bminfo, DIB_RGB_COLORS ); } } - GlobalUnlock16( hObj ); - } - return HICON_32(hObj); + GlobalUnlock( hObj ); + } + return hObj; } /****************************************************************************** @@ -2297,7 +2297,7 @@ TRACE_(icon)("(hdc=%p,pos=%d.%d,hicon=%p,extend=%d.%d,istep=%d,br=%p,flags=0x%08x)\n", hdc,x0,y0,hIcon,cxWidth,cyWidth,istep,hbr,flags ); - if (!(ptr = GlobalLock16(HICON_16(hIcon)))) return FALSE; + if (!(ptr = GlobalLock(hIcon))) return FALSE; if (!(hMemDC = CreateCompatibleDC( hdc ))) return FALSE; if (istep) @@ -2444,7 +2444,7 @@ if (hMemDC) DeleteDC( hMemDC ); if (hDC_off) DeleteDC(hDC_off); if (hB_off) DeleteObject(hB_off); - GlobalUnlock16(HICON_16(hIcon)); + GlobalUnlock(hIcon); return result; } Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -22,7 +22,6 @@ #include "wine/port.h" #include <ctype.h> -#include <errno.h> #include <limits.h> #include <stdlib.h> #include <stdarg.h> @@ -1379,7 +1378,7 @@ result = strtol( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno==ERANGE)) + if (((result == LONG_MIN) || (result == LONG_MAX))/* && (errno==ERANGE)*/) return 0; } else @@ -1387,7 +1386,7 @@ result = strtoul( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - if ((result == ULONG_MAX) && (errno == ERANGE)) return 0; + if ((result == ULONG_MAX)/* && (errno == ERANGE)*/) return 0; } if (translated) *translated = TRUE; return (UINT)result; Modified: branches/arwinss/reactos/dll/win32/user32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -41,7 +41,12 @@ HMODULE graphics_driver; USER_DRIVER *driver, *prev; +#ifndef __REACTOS__ strcpy( buffer, "x11" ); /* default value */ +#else + strcpy( buffer, "nt" ); +#endif +#if 0 /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) { @@ -49,14 +54,14 @@ RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count ); RegCloseKey( hkey ); } - +#endif name = buffer; while (name) { next = strchr( name, ',' ); if (next) *next++ = 0; - snprintf( libname, sizeof(libname), "wine%s.drv", name ); + _snprintf( libname, sizeof(libname), "wine%s.drv", name ); if ((graphics_driver = LoadLibraryA( libname )) != 0) break; name = next; } Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -4487,6 +4487,7 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { +#if 0 HIMC hIMC; int cursor; @@ -4508,6 +4509,9 @@ cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); +#else + UNIMPLEMENTED; +#endif } Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -9,9 +9,13 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" +#include "win32k/rosuser.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(userlegacy); + +void WINAPI DbgBreakPoint(void); LPVOID WINAPI @@ -34,6 +38,7 @@ GlobalAlloc16(UINT16 u, DWORD d) { UNIMPLEMENTED; + DbgBreakPoint(); return 0; } @@ -58,7 +63,7 @@ LocalLock16(HLOCAL16 h) { UNIMPLEMENTED; - return NULL; + return 0; } BOOL16 @@ -96,3 +101,22 @@ RestoreThunkLock(DWORD mutex_count) { } + +/* + * Private calls for CSRSS + */ +VOID +WINAPI +PrivateCsrssManualGuiCheck(LONG Check) +{ + UNIMPLEMENTED; +} + +VOID +WINAPI +PrivateCsrssInitialized(VOID) +{ + /* Perform a reactos only CSRSS connection */ + RosUserConnectCsrss(); +} + Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -3082,7 +3082,7 @@ capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; set_capture_window( capture_win, GUI_INMENUMODE, NULL ); - __TRY while (!fEndMenu) + /*__TRY*/ while (!fEndMenu) { menu = MENU_GetMenu( mt.hCurrentMenu ); if (!menu) /* sometimes happens if I do a window manager close */ @@ -3303,7 +3303,7 @@ PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); else mt.trackFlags &= ~TF_SKIPREMOVE; } - __FINALLY( release_capture ) + /*__FINALLY(*/ release_capture(TRUE); /*)*/ /* If dropdown is still painted and the close box is clicked on then the menu will be destroyed as part of the DispatchMessage above. Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -706,14 +706,3 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - -/********************************************************************** - * DisableProcessWindowsGhosting [USER32.@] - * - */ -VOID WINAPI DisableProcessWindowsGhosting(VOID) -{ - FIXME(": stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return; -} Modified: branches/arwinss/reactos/dll/win32/user32/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/resource.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/resource.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -74,7 +74,7 @@ { HRSRC hRsrc; HACCEL hMem; - HACCEL16 hRetval=0; + HACCEL hRetval=0; DWORD size; if (HIWORD(lpTableName)) @@ -91,11 +91,11 @@ if(size>=sizeof(PE_ACCEL)) { LPPE_ACCEL accel_table = (LPPE_ACCEL) hMem; - LPACCEL16 accel16; + LPACCEL accel16; int i,nrofaccells = size/sizeof(PE_ACCEL); - hRetval = GlobalAlloc16(0,sizeof(ACCEL16)*nrofaccells); - accel16 = (LPACCEL16)GlobalLock16(hRetval); + hRetval = GlobalAlloc(0,sizeof(ACCEL)*nrofaccells); + accel16 = (LPACCEL)GlobalLock(hRetval); for (i=0;i<nrofaccells;i++) { accel16[i].fVirt = accel_table[i].fVirt & 0x7f; accel16[i].key = accel_table[i].key; @@ -148,7 +148,7 @@ INT entries) { int i,xsize; - LPACCEL16 accel = (LPACCEL16)GlobalLock16(LOWORD(src)); + LPACCEL accel = (LPACCEL)GlobalLock(src); BOOL done = FALSE; /* Do parameter checking to avoid the explosions and the screaming @@ -158,7 +158,7 @@ src, dst, entries); return 0; } - xsize = GlobalSize16(LOWORD(src))/sizeof(ACCEL16); + xsize = GlobalSize(src)/sizeof(ACCEL); if (xsize<entries) entries=xsize; i=0; @@ -198,7 +198,7 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT cEntries) { HACCEL hAccel; - LPACCEL16 accel; + LPACCEL accel; int i; /* Do parameter checking just in case someone's trying to be @@ -211,7 +211,7 @@ } /* Allocate memory and copy the table. */ - hAccel = GlobalAlloc16(0,cEntries*sizeof(ACCEL16)); + hAccel = GlobalAlloc(0,cEntries*sizeof(ACCEL)); TRACE_(accel)("handle %p\n", hAccel); if(!hAccel) { @@ -219,7 +219,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - accel = GlobalLock16(hAccel); + accel = GlobalLock(hAccel); for (i=0;i<cEntries;i++) { accel[i].fVirt = lpaccel[i].fVirt&0x7f; accel[i].key = lpaccel[i].key; @@ -242,7 +242,7 @@ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccel, INT cEntries) { HACCEL hAccel; - LPACCEL16 accel; + LPACCEL accel; int i; char ckey; @@ -256,7 +256,7 @@ } /* Allocate memory and copy the table. */ - hAccel = GlobalAlloc16(0,cEntries*sizeof(ACCEL16)); + hAccel = GlobalAlloc(0,cEntries*sizeof(ACCEL)); TRACE_(accel)("handle %p\n", hAccel); if(!hAccel) { @@ -264,7 +264,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - accel = GlobalLock16(LOWORD(hAccel)); + accel = GlobalLock(hAccel); for (i=0;i<cEntries;i++) { @@ -304,7 +304,7 @@ { if( !handle ) return FALSE; - return !GlobalFree16(handle); + return !GlobalFree(handle); } /********************************************************************** Modified: branches/arwinss/reactos/dll/win32/user32/spy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -2667,6 +2667,7 @@ indent_tls_index = TlsAlloc(); /* @@ Wine registry key: HKCU\Software\Wine\Debug */ +#if 0 if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Debug", &hkey)) { DWORD type, count = sizeof(buffer); @@ -2699,7 +2700,7 @@ RegCloseKey(hkey); } - +#endif /* find last good entry in spy notify array and save addr for b-search */ p = &spnfy_array[0]; j = 0xffffffff; Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -657,6 +657,7 @@ const BYTE* lpValue, DWORD valueSize, DWORD type, UINT fWinIni ) { +#if 0 HKEY hKey; HKEY hBaseKey; DWORD dwOptions; @@ -687,6 +688,9 @@ RegCloseKey( hKey ); } return ret; +#else + return TRUE; +#endif } /* Convenience function to save strings */ @@ -946,7 +950,7 @@ /* initialize system colors */ - if (RegCreateKeyExA(HKEY_CURRENT_USER, "Control Panel\\Colors", 0, 0, 0, KEY_ALL_ACCESS, 0, &hkey, 0)) + //if (RegCreateKeyExA(HKEY_CURRENT_USER, "Control Panel\\Colors", 0, 0, 0, KEY_ALL_ACCESS, 0, &hkey, 0)) hkey = 0; for (i = 0; i < NUM_SYS_COLORS; i++) { @@ -3306,3 +3310,13 @@ return TRUE; } + +/*********************************************************************** + * UpdatePerUserSystemParameters (USER32.@) + */ +BOOL WINAPI UpdatePerUserSystemParameters ( DWORD dwUnknown ) +{ + FIXME( "stub, param %d!\n", dwUnknown); + + return TRUE; +} Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -13,7 +13,7 @@ <library>gdi32</library> <library>kernel32</library> <library>advapi32</library> - <library>imm32</library> +  <library>win32ksys</library> <library>pseh</library> Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -2,7 +2,7 @@ @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) @ stdcall AlignRects(ptr long long long) -# @ stub AllowForegroundActivation +@ stub AllowForegroundActivation @ stdcall AllowSetForegroundWindow (long) @ stdcall AnimateWindow(long long long) @ stdcall AnyPopup() @@ -19,9 +19,9 @@ @ stdcall BroadcastSystemMessageExA(long ptr long long long ptr) @ stdcall BroadcastSystemMessageExW(long ptr long long long ptr) @ stdcall BroadcastSystemMessageW(long ptr long long long) -# @ stub BuildReasonArray +@ stub BuildReasonArray @ stdcall CalcChildScroll(long long) -# @ stub CalcMenuBar +@ stub CalcMenuBar @ stdcall CallMsgFilter(ptr long) CallMsgFilterA @ stdcall CallMsgFilterA(ptr long) @ stdcall CallMsgFilterW(ptr long) @@ -66,7 +66,7 @@ @ stdcall ChildWindowFromPointEx(long double long) @ stub CliImmSetHotKey @ stub ClientThreadConnect -@ stub ClientThreadSetup +@ stdcall ClientThreadSetup() @ stdcall ClientToScreen(long ptr) @ stdcall ClipCursor(ptr) @ stdcall CloseClipboard() @@ -98,13 +98,13 @@ @ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() -# @ stub CreateSystemThreads +@ stub CreateSystemThreads @ stdcall CreateWindowExA(long str str long long long long long long long long ptr) @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) @ stdcall CreateWindowStationA(str long long ptr) @ stdcall CreateWindowStationW(wstr long long ptr) -# @ stub CsrBroadcastSystemMessageExW -# @ stub CtxInitUser32 +@ stub CsrBroadcastSystemMessageExW +@ stub CtxInitUser32 @ stdcall DdeAbandonTransaction(long long long) @ stdcall DdeAccessData(long ptr) @ stdcall DdeAddData(long ptr long long) @@ -155,9 +155,9 @@ @ stdcall DestroyCursor(long) @ stdcall DestroyIcon(long) @ stdcall DestroyMenu(long) -# @ stub DestroyReasons +@ stub DestroyReasons @ stdcall DestroyWindow(long) -# @ stub DeviceEventWorker +@ stub DeviceEventWorker @ stdcall DialogBoxIndirectParamA(long ptr long ptr long) @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long) @ stdcall DialogBoxIndirectParamW(long ptr long ptr long) @@ -166,7 +166,7 @@ @ stdcall DisableProcessWindowsGhosting() @ stdcall DispatchMessageA(ptr) @ stdcall DispatchMessageW(ptr) -# @ stub DisplayExitWindowsWarnings +@ stub DisplayExitWindowsWarnings @ stdcall DlgDirListA(long str long long long) @ stdcall DlgDirListComboBoxA(long ptr long long long) @ stdcall DlgDirListComboBoxW(long ptr long long long) @@ -205,7 +205,7 @@ @ stdcall EndMenu() @ stdcall EndPaint(long ptr) @ stub EndTask -# @ stub EnterReaderModeHelper +@ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) @ stdcall EnumDesktopWindows(long ptr ptr) @@ -272,7 +272,7 @@ @ stdcall GetClipboardViewer() @ stdcall GetComboBoxInfo(long ptr) @ stdcall GetCursor() -# @ stub GetCursorFrameInfo +@ stub GetCursorFrameInfo @ stdcall GetCursorInfo(ptr) @ stdcall GetCursorPos(ptr) @ stdcall GetDC(long) @@ -306,7 +306,7 @@ @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) -# @ stub GetListBoxInfo +@ stub GetListBoxInfo @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) @ stdcall GetMenuCheckMarkDimensions() @@ -332,7 +332,7 @@ @ stdcall GetMouseMovePointsEx(long ptr ptr long long) @ stdcall GetNextDlgGroupItem(long long long) @ stdcall GetNextDlgTabItem(long long long) -# @ stub GetNextQueueWindow +@ stub GetNextQueueWindow @ stdcall GetOpenClipboardWindow() @ stdcall GetParent(long) @ stdcall GetPriorityClipboardFormat(ptr long) @@ -347,7 +347,7 @@ @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr) @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) -# @ stub GetReasonTitleFromReasonCode +@ stub GetReasonTitleFromReasonCode @ stdcall GetRegisteredRawInputDevices(ptr ptr long) @ stdcall GetScrollBarInfo(long long ptr) @ stdcall GetScrollInfo(long long ptr) @@ -370,7 +370,7 @@ @ stdcall GetUserObjectInformationA (long long ptr long ptr) @ stdcall GetUserObjectInformationW (long long ptr long ptr) @ stdcall GetUserObjectSecurity (long ptr ptr long ptr) -# @ stub GetWinStationInfo +@ stub GetWinStationInfo @ stdcall GetWindow(long long) @ stdcall GetWindowContextHelpId(long) @ stdcall GetWindowDC(long) @@ -397,20 +397,20 @@ # @ stub HasSystemSleepStarted @ stdcall HideCaret(long) @ stdcall HiliteMenuItem(long long long long) -# @ stub IMPGetIMEA -# @ stub IMPGetIMEW -# @ stub IMPQueryIMEA -# @ stub IMPQueryIMEW -# @ stub IMPSetIMEA -# @ stub IMPSetIMEW +@ stub IMPGetIMEA +@ stub IMPGetIMEW +@ stub IMPQueryIMEA +@ stub IMPQueryIMEW +@ stub IMPSetIMEA +@ stub IMPSetIMEW @ stdcall ImpersonateDdeClientWindow(long long) @ stdcall InSendMessage() @ stdcall InSendMessageEx(ptr) @ stdcall InflateRect(ptr long long) # @ stub InitSharedTable # @ stub InitTask -# @ stub InitializeLpkHooks -# @ stub InitializeWin32EntryTable +@ stub InitializeLpkHooks +@ stub InitializeWin32EntryTable @ stdcall InsertMenuA(long long long long ptr) @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @@ -434,17 +434,18 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -# @ stub IsGUIThread +@ stub IsGUIThread @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) @ stdcall IsMenu(long) @ stdcall IsRectEmpty(ptr) -# @ stub IsServerSideWindow +@ stub IsSETEnabled +@ stub IsServerSideWindow @ stdcall IsWinEventHookInstalled(long) @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) -# @ stub IsWindowInDestroy +@ stub IsWindowInDestroy @ stdcall IsWindowUnicode(long) @ stdcall IsWindowVisible(long) @ stdcall IsZoomed(long) @@ -463,7 +464,7 @@ @ stdcall LoadImageA(long str long long long long) @ stdcall LoadImageW(long wstr long long long long) @ stdcall LoadKeyboardLayoutA(str long) -# @ stub LoadKeyboardLayoutEx +@ stub LoadKeyboardLayoutEx @ stdcall LoadKeyboardLayoutW(wstr long) @ stdcall LoadLocalFonts() @ stdcall LoadMenuA(long str) @@ -480,7 +481,7 @@ @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx -# @ stub MB_GetString +@ stub MB_GetString @ stdcall MapDialogRect(long ptr) @ stdcall MapVirtualKeyA(long long) @ stdcall MapVirtualKeyExA(long long long) @@ -496,8 +497,8 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -# @ stub MessageBoxTimeoutA -# @ stub MessageBoxTimeoutW +@ stub MessageBoxTimeoutA +@ stub MessageBoxTimeoutW @ stdcall MessageBoxW(long wstr wstr long) # @ stub ModifyAccess @ stdcall ModifyMenuA(long long long long ptr) @@ -524,7 +525,7 @@ @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) @ stdcall PaintDesktop(long) -# @ stub PaintMenuBar +@ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) @ stub PlaySoundEvent @@ -533,7 +534,7 @@ @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) @ stdcall PostThreadMessageW(long long long long) -# @ stub PrintWindow +@ stub PrintWindow @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) @ stdcall PrivateExtractIconsA (str long long long ptr ptr long long) @@ -547,9 +548,9 @@ @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @ stdcall RealGetWindowClassA(long ptr long) @ stdcall RealGetWindowClassW(long ptr long) -# @ stub ReasonCodeNeedsBugID -# @ stub ReasonCodeNeedsComment -# @ stub RecordShutdownReason +@ stub ReasonCodeNeedsBugID +@ stub ReasonCodeNeedsComment +@ stub RecordShutdownReason @ stdcall RedrawWindow(long ptr long long) @ stdcall RegisterClassA(ptr) @ stdcall RegisterClassExA(ptr) @@ -561,14 +562,14 @@ @ stdcall RegisterDeviceNotificationW(long ptr long) @ stdcall RegisterHotKey(long long long long) @ stdcall RegisterLogonProcess(long long) -# @ stub RegisterMessagePumpHook +@ stub RegisterMessagePumpHook @ stub RegisterNetworkCapabilities @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) -# @ stub RegisterUserApiHook +@ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @@ -610,14 +611,14 @@ @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) -# @ stub SetConsoleReserveKeys +@ stub SetConsoleReserveKeys @ stdcall SetCursor(long) @ stub SetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) @ stdcall SetDeskWallPaper(ptr) -# @ stub SetDeskWallpaper -# @ stub SetDesktopBitmap +@ stub SetDeskWallpaper +@ stub SetDesktopBitmap @ stdcall SetDlgItemInt(long long long long) @ stdcall SetDlgItemTextA(long long str) @ stdcall SetDlgItemTextW(long long wstr) @@ -689,7 +690,7 @@ @ stub ShowStartGlass @ stdcall ShowWindow(long long) @ stdcall ShowWindowAsync(long long) -# @ stub SoftModalMessageBox +@ stub SoftModalMessageBox @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) @ stdcall SwitchDesktop(long) @@ -713,7 +714,7 @@ @ stdcall TranslateAcceleratorW(long long ptr) @ stdcall TranslateMDISysAccel(long ptr) @ stdcall TranslateMessage(ptr) -# @ stub TranslateMessageEx +@ stub TranslateMessageEx @ stdcall UnhookWinEvent(long) @ stdcall UnhookWindowsHook(long ptr) @ stdcall UnhookWindowsHookEx(long) @@ -725,18 +726,18 @@ @ stdcall UnregisterClassW(wstr long) @ stdcall UnregisterDeviceNotification(long) @ stdcall UnregisterHotKey(long long) -# @ stub UnregisterMessagePumpHook -# @ stub UnregisterUserApiHook +@ stub UnregisterMessagePumpHook +@ stub UnregisterUserApiHook @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) -@ stub UpdatePerUserSystemParameters +@ stdcall UpdatePerUserSystemParameters(long) @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain @ stub UserHandleGrantAccess # @ stub UserIsSystemResumeAutomatic -# @ stub UserLpkPSMTextOut -# @ stub UserLpkTabbedTextOut +@ stub UserLpkPSMTextOut +@ stub UserLpkTabbedTextOut @ stdcall UserRealizePalette(long) @ stub UserRegisterWowHandlers # @ stub UserSetDeviceHoldState @@ -756,7 +757,7 @@ @ stub WNDPROC_CALLBACK @ stdcall WaitForInputIdle(long long) @ stdcall WaitMessage() -# @ stub Win32PoolAllocationStats +@ stub Win32PoolAllocationStats @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) # @ stub WinOldAppHackoMatic @@ -781,3 +782,9 @@ # Wine dll separation hacks, these will go away, don't use them # @ cdecl HOOK_CallHooks(long long long long long) + +################################################################# +# ROS specific exports +# +@ stdcall PrivateCsrssManualGuiCheck(long) +@ stdcall PrivateCsrssInitialized() Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -76,7 +76,7 @@ void USER_CheckNotLock(void) { //_CheckNotSysLevel( &USER_SysLevel ); - UNIMPLEMENTED; + //UNIMPLEMENTED; } @@ -174,6 +174,7 @@ strcpyW( p, explorerW ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Explorer */ +#if 0 if (!RegOpenKeyW( HKEY_CURRENT_USER, app_defaultsW, &tmpkey )) { if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; @@ -187,17 +188,19 @@ ret = defaultW; } } - +#endif memcpy( buffer, app_defaultsW, 13 * sizeof(WCHAR) ); /* copy only software\\wine */ strcpyW( buffer + 13, explorerW ); /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ +#if 0 if (!RegOpenKeyW( HKEY_CURRENT_USER, buffer, &appkey )) { len = sizeof(buffer); if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; RegCloseKey( appkey ); } +#endif return ret; } @@ -402,5 +405,13 @@ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { FIXME("(0x%x): stub\n", ServicesProcessId); - return 0; -} + return TRUE; +} + + +BOOL ClientThreadSetup() +{ + TRACE(": stub\n"); + return TRUE; +} + Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -32,34 +32,15 @@ #include "wine/winbase16.h" extern WORD USER_HeapSel DECLSPEC_HIDDEN; -NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); -static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size ) -{ - DbgPrint("LOCAL_Alloc unimplemented!\n"); - return 0; -} - -static inline HLOCAL16 LOCAL_ReAlloc( HANDLE16 ds, HLOCAL16 handle, WORD size, UINT16 flags ) -{ - DbgPrint("LOCAL_ReAlloc unimplemented!\n"); - return 0; -} - -static inline HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle ) -{ - DbgPrint("LOCAL_Free unimplemented!\n"); - return 0; -} #define USER_HEAP_ALLOC(size) \ - ((HANDLE)(ULONG_PTR)LOCAL_Alloc( USER_HeapSel, LMEM_FIXED, (size) )) + ((HANDLE)HeapAlloc( GetProcessHeap(), 0, (size) )) #define USER_HEAP_REALLOC(handle,size) \ - ((HANDLE)(ULONG_PTR)LOCAL_ReAlloc( USER_HeapSel, LOWORD(handle), (size), LMEM_FIXED )) + ((HANDLE)HeapReAlloc( GetProcessHeap(), 0, (handle), (size) )) #define USER_HEAP_FREE(handle) \ - LOCAL_Free( USER_HeapSel, LOWORD(handle) ) + HeapFree( GetProcessHeap(), 0, handle ) #define USER_HEAP_LIN_ADDR(handle) \ - /*((handle) ? MapSL(MAKESEGPTR(USER_HeapSel, LOWORD(handle))) : NULL)*/ \ - (handle) + (handle) #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) @@ -339,10 +320,23 @@ extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; -/* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ -#ifdef __MINGW32__ +NTSYSAPI +VOID +NTAPI +RtlAssert( + PVOID FailedAssertion, + PVOID FileName, + ULONG LineNumber, + PCHAR Message +); + +#ifdef assert #undef assert -#define assert(expr) ((void)0) #endif +#define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } + +#ifndef ASSERT +#define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +#endif #endif /* __WINE_USER_PRIVATE_H */ Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -3398,7 +3398,20 @@ */ BOOL WINAPI SwitchDesktop( HDESK hDesktop) { + HWND hWnd; + FIXME("SwitchDesktop(hwnd %p) stub!\n", hDesktop); + + hWnd = GetDesktopWindow(/*hDesktop*/); + + SetWindowPos(hWnd, + NULL, 0, 0, + 800,//nmh->ShowDesktop.Width, + 600,//nmh->ShowDesktop.Height, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW); + UpdateWindow(hWnd); + + return TRUE; } Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Jul 18 10:50:27 2009 @@ -83,6 +83,7 @@ /* find an existing winproc for a given 16-bit function and type */ /* FIXME: probably should do something more clever than a linear search */ +#ifndef __REACTOS__ static inline WINDOWPROC *find_winproc16( WNDPROC16 func ) { unsigned int i; @@ -93,7 +94,7 @@ } return NULL; } - +#endif /* find an existing winproc for a given function and type */ /* FIXME: probably should do something more clever than a linear search */ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) @@ -172,7 +173,7 @@ return proc; } - +#ifndef __REACTOS__ #ifdef __i386__ #include "pshpack1.h" @@ -272,6 +273,7 @@ } #endif /* __i386__ */ +#endif /* __REACTOS__ */ #ifdef __i386__ @@ -655,6 +657,7 @@ * lot of windows, it will usually only have a limited number of window procedures, so the * array won't grow too large, and this way we avoid the need to track allocations per window. */ +#ifndef __REACTOS__ WNDPROC WINPROC_AllocProc16( WNDPROC16 func ) { WINDOWPROC *proc; @@ -684,6 +687,7 @@ } return proc_to_handle( proc ); } +#endif /**********************************************************************

1 0

[fireball] 42025: - Add assert/ASSERT implementation to prevent linking with a wrong msvcrt version of it. - Fix one msvcrt function linkage (snprintf -> _snprintf). - Stub out all other registry operations for now and thus get rid of advapi32 dependancy (and unbreak the system). - Start converting registry operations from advapi32 to native functions. - Initial port of freetype.c to ReactOS. Many places are UNIMPLEMENTED yet. - Implement GdiAddFontResourceW as a success-returning stub. - Fix gd
by fireball＠svn.reactos.org 18 Jul '09

18 Jul '09

Author: fireball Date: Sat Jul 18 10:29:27 2009 New Revision: 42025 URL: http://svn.reactos.org/svn/reactos?rev=42025&view=rev Log: - Add assert/ASSERT implementation to prevent linking with a wrong msvcrt version of it. - Fix one msvcrt function linkage (snprintf -> _snprintf). - Stub out all other registry operations for now and thus get rid of advapi32 dependancy (and unbreak the system). - Start converting registry operations from advapi32 to native functions. - Initial port of freetype.c to ReactOS. Many places are UNIMPLEMENTED yet. - Implement GdiAddFontResourceW as a success-returning stub. - Fix gdi32 exports so it loads on Windows 2003. - 16->32 conversion in user32/cursoricon. - Remove all calls to advapi's registry operations from gdi32 init and use defaults. Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/driver.c [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -237,22 +237,27 @@ return display_driver; } +#ifndef __REACTOS__ strcpy( buffer, "x11" ); /* default value */ +#else + strcpy( buffer, "nt" ); /* default value */ +#endif /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ +#if 0 if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) { DWORD type, count = sizeof(buffer); RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count ); RegCloseKey( hkey ); } - +#endif name = buffer; while (name) { next = strchr( name, ',' ); if (next) *next++ = 0; - snprintf( libname, sizeof(libname), "wine%s.drv", name ); + _snprintf( libname, sizeof(libname), "wine%s.drv", name ); if ((module = LoadLibraryA( libname )) != 0) break; name = next; } Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -3298,3 +3298,16 @@ return ret; } + + +int +WINAPI +GdiAddFontResourceW( + LPCWSTR lpszFilename, + FLONG fl, + DESIGNVECTOR *pdv) +{ + FIXME("GdiAddFontResourceW(%S %p) UNIMPLEMENTED\n", lpszFilename, pdv); + return 0; +} + Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -77,9 +77,12 @@ #undef SetRectRgn #endif /* HAVE_CARBON_CARBON_H */ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER #include "windef.h" #include "winbase.h" -#include "winternl.h" +#include <ndk/ntndk.h> +#include <ddk/ntstatus.h> #include "winerror.h" #include "winreg.h" #include "wingdi.h" @@ -109,6 +112,10 @@ #endif #ifdef HAVE_FREETYPE_FTSNAMES_H #include <freetype/ftsnames.h> +#else +# ifdef HAVE_FREETYPE_FTNAMES_H +# include <freetype/ftnames.h> +# endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H #include <freetype/ttnameid.h> @@ -851,10 +858,10 @@ Family *family; Face *face; const char *file; - DWORD len = WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, NULL, 0, NULL, NULL); + DWORD len = WideCharToMultiByte(CP_ACP, 0, file_name, -1, NULL, 0, NULL, NULL); char *file_nameA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, file_name, -1, file_nameA, len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, file_name, -1, file_nameA, len, NULL, NULL); TRACE("looking for file %s name %s\n", debugstr_a(file_nameA), debugstr_w(face_name)); LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) @@ -999,6 +1006,7 @@ static void LoadSubstList(void) { +#if 0 FontSubst *psub; HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; @@ -1044,6 +1052,9 @@ HeapFree(GetProcessHeap(), 0, value); RegCloseKey(hkey); } +#else + UNIMPLEMENTED; +#endif } @@ -1576,6 +1587,7 @@ */ static void LoadReplaceList(void) { +#if 0 HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; LPWSTR value; @@ -1626,6 +1638,9 @@ HeapFree(GetProcessHeap(), 0, value); RegCloseKey(hkey); } +#else + UNIMPLEMENTED; +#endif } /************************************************************* @@ -1646,17 +1661,75 @@ Family *family; Face *face; FontSubst *psub; - - if(RegOpenKeyW(HKEY_LOCAL_MACHINE, system_link, &hkey) == ERROR_SUCCESS) - { - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_val, &max_data, NULL, NULL); + NTSTATUS Status; + OBJECT_ATTRIBUTES Attributes; + UNICODE_STRING system_link = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink"); + KEY_FULL_INFORMATION FullInfoBuffer; + PKEY_FULL_INFORMATION FullInfo; + ULONG FullInfoSize, Length, total_size; + char buffer[256]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + + InitializeObjectAttributes(&Attributes, &system_link, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenKey(&hkey, KEY_READ, &Attributes); + if (NT_SUCCESS(Status)) + { + FullInfoSize = sizeof(KEY_FULL_INFORMATION); + FullInfo = &FullInfoBuffer; + Status = NtQueryKey(hkey, KeyFullInformation, FullInfo, FullInfoSize, &Length); + if (!NT_SUCCESS(Status)) + { + ERR("NtQueryKey failed with Status 0x%08X\n", Status); + NtClose(hkey); + return; + } + + max_val = FullInfo->MaxValueNameLen / sizeof(WCHAR) + 1; + max_data = FullInfo->MaxValueDataLen; + value = HeapAlloc(GetProcessHeap(), 0, (max_val + 1) * sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, max_data); val_len = max_val + 1; data_len = max_data; index = 0; - while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS) + while(TRUE) { + total_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ) + (MAX_PATH + 1) * sizeof(WCHAR) + data_len; + total_size = min(sizeof(buffer), total_size); + Status = NtEnumerateValueKey(hkey, index++, KeyValueFullInformation, buffer, total_size, &total_size); + if (Status == STATUS_BUFFER_OVERFLOW) + { + UNIMPLEMENTED; + } + else if (!NT_SUCCESS(Status)) break; + + /* Copy value */ + if (info->NameLength/sizeof(WCHAR) < val_len) + { + memcpy( value, info->Name, info->NameLength ); + val_len = info->NameLength / sizeof(WCHAR); + value[val_len] = 0; + } + + /* Copy data */ + if (total_size - info->DataOffset < data_len) + { + memcpy( data, buffer + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= data_len - sizeof(WCHAR) && + ((info->Type == REG_SZ) || (info->Type == REG_EXPAND_SZ) || (info->Type == REG_MULTI_SZ))) + { + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + } + } + + /* Copy type and data length */ + type = info->Type; + data_len = info->DataLength; + + memset(&fs, 0, sizeof(fs)); psub = get_font_subst(&font_subst_list, value, -1); /* Don't store fonts that are only substitutes for other fonts */ @@ -1718,7 +1791,7 @@ HeapFree(GetProcessHeap(), 0, value); HeapFree(GetProcessHeap(), 0, data); - RegCloseKey(hkey); + NtClose(hkey); } /* Explicitly add an entry for the system font, this links to Tahoma and any links @@ -1759,6 +1832,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { +#if 0 DIR *dir; struct dirent *dent; char path[MAX_PATH]; @@ -1792,6 +1866,13 @@ } closedir(dir); return TRUE; +#else + AddFontFileToList("C:\\ReactOS\\fonts\\tahoma.ttf", NULL, NULL, external_fonts ? ADDFONT_EXTERNAL_FONT : 0); + AddFontFileToList("C:\\ReactOS\\fonts\\symbol.ttf", NULL, NULL, external_fonts ? ADDFONT_EXTERNAL_FONT : 0); + AddFontFileToList("C:\\ReactOS\\fonts\\Marlett.ttf", NULL, NULL, external_fonts ? ADDFONT_EXTERNAL_FONT : 0); + UNIMPLEMENTED; + return TRUE; +#endif } static void load_fontconfig_fonts(void) @@ -1878,14 +1959,14 @@ INT len; char *unix_name; - len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, file, -1, NULL, 0, NULL, NULL); unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); strcpy(unix_name, data_dir); strcat(unix_name, "/fonts/"); - WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); EnterCriticalSection( &freetype_cs ); ret = AddFontFileToList(unix_name, NULL, NULL, ADDFONT_FORCE_BITMAP); @@ -1900,29 +1981,28 @@ static const WCHAR slashW[] = {'\\','\0'}; BOOL ret = FALSE; WCHAR windowsdir[MAX_PATH]; - char *unixname; + char windowsdirA[MAX_PATH]; GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); strcatW(windowsdir, fontsW); strcatW(windowsdir, slashW); strcatW(windowsdir, file); - if ((unixname = wine_get_unix_file_name(windowsdir))) { - EnterCriticalSection( &freetype_cs ); - ret = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); - LeaveCriticalSection( &freetype_cs ); - HeapFree(GetProcessHeap(), 0, unixname); - } + sprintf(windowsdirA, "%S", windowsdir); + EnterCriticalSection( &freetype_cs ); + ret = AddFontFileToList(windowsdirA, NULL, NULL, ADDFONT_FORCE_BITMAP); + LeaveCriticalSection( &freetype_cs ); return ret; } static void load_system_fonts(void) { +#if 0 HKEY hkey; WCHAR data[MAX_PATH], windowsdir[MAX_PATH], pathW[MAX_PATH]; + char pathA[MAX_PATH]; const WCHAR * const *value; DWORD dlen, type; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; - char *unixname; if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); @@ -1934,16 +2014,15 @@ BOOL added = FALSE; sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) { - added = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); - HeapFree(GetProcessHeap(), 0, unixname); - } + sprintf(pathA, "%S", pathW); + added = AddFontFileToList(pathA, NULL, NULL, ADDFONT_FORCE_BITMAP); if (!added) load_font_from_data_dir(data); } } RegCloseKey(hkey); } +#endif } /************************************************************* @@ -1955,6 +2034,7 @@ */ static void update_reg_entries(void) { +#if 0 HKEY winnt_key = 0, win9x_key = 0, external_key = 0; LPWSTR valueW; DWORD len, len_fam; @@ -2003,7 +2083,7 @@ } strcatW(valueW, TrueType); - file = wine_get_dos_file_name(face->file); + file = NULL;//wine_get_dos_file_name(face->file); if(file) len = strlenW(file) + 1; else @@ -2030,10 +2110,14 @@ if(win9x_key) RegCloseKey(win9x_key); if(winnt_key) RegCloseKey(winnt_key); return; +#else + UNIMPLEMENTED; +#endif } static void delete_external_font_keys(void) { +#if 0 HKEY winnt_key = 0, win9x_key = 0, external_key = 0; DWORD dlen, vlen, datalen, valuelen, i, type; LPWSTR valueW; @@ -2086,6 +2170,9 @@ end: if(win9x_key) RegCloseKey(win9x_key); if(winnt_key) RegCloseKey(winnt_key); +#else + UNIMPLEMENTED; +#endif } /************************************************************* @@ -2105,6 +2192,7 @@ if(flags) FIXME("Ignoring flags %x\n", flags); +#if 0 if((unixname = wine_get_unix_file_name(file))) { EnterCriticalSection( &freetype_cs ); @@ -2112,6 +2200,9 @@ LeaveCriticalSection( &freetype_cs ); HeapFree(GetProcessHeap(), 0, unixname); } +#else + UNIMPLEMENTED; +#endif if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ ret = load_font_from_winfonts_dir(file); @@ -2371,8 +2462,8 @@ { HKEY hkey = 0; - RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, 0, NULL, - 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + //RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, 0, NULL, + // 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); return hkey; } @@ -2380,8 +2471,8 @@ { HKEY hkey = 0; - RegCreateKeyExW(HKEY_LOCAL_MACHINE, win9x_font_reg_key, 0, NULL, - 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + //RegCreateKeyExW(HKEY_LOCAL_MACHINE, win9x_font_reg_key, 0, NULL, + // 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); return hkey; } @@ -2389,29 +2480,30 @@ { HKEY hkey = 0; - RegCreateKeyExW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, 0, NULL, - 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + //RegCreateKeyExW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, 0, NULL, + // 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); return hkey; } static void add_font_list(HKEY hkey, const struct nls_update_font_list *fl) { - RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); - RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); - RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)fl->sserif, strlen(fl->sserif)+1); - RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); + //RegSetValueExA(hkey, "Courier", 0, REG_SZ, (const BYTE *)fl->courier, strlen(fl->courier)+1); + //RegSetValueExA(hkey, "MS Serif", 0, REG_SZ, (const BYTE *)fl->serif, strlen(fl->serif)+1); + //RegSetValueExA(hkey, "MS Sans Serif", 0, REG_SZ, (const BYTE *)fl->sserif, strlen(fl->sserif)+1); + //RegSetValueExA(hkey, "Small Fonts", 0, REG_SZ, (const BYTE *)fl->small, strlen(fl->small)+1); } static void set_value_key(HKEY hkey, const char *name, const char *value) { - if (value) - RegSetValueExA(hkey, name, 0, REG_SZ, (const BYTE *)value, strlen(value) + 1); - else if (name) - RegDeleteValueA(hkey, name); + //if (value) + // RegSetValueExA(hkey, name, 0, REG_SZ, (const BYTE *)value, strlen(value) + 1); + //else if (name) + // RegDeleteValueA(hkey, name); } static void update_font_info(void) { +#if 0 char buf[40], cpbuf[40]; DWORD len, type; HKEY hkey = 0; @@ -2508,6 +2600,9 @@ /* Clear out system links */ RegDeleteKeyW(HKEY_LOCAL_MACHINE, system_link); +#else + UNIMPLEMENTED; +#endif } static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *const *values) @@ -2637,7 +2732,7 @@ static BOOL init_freetype(void) { - ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + ft_handle = LoadLibraryA("freetype.dll"); if(!ft_handle) { WINE_MESSAGE( "Wine cannot find the FreeType font library. To enable Wine to\n" @@ -2647,7 +2742,7 @@ return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} +#define LOAD_FUNCPTR(f) if((p##f = GetProcAddress(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Vector_Unit) LOAD_FUNCPTR(FT_Done_Face) @@ -2675,19 +2770,19 @@ #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ - pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); - pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); - pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); - pFT_Get_Next_Char = wine_dlsym(ft_handle, "FT_Get_Next_Char", NULL, 0); - pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); + pFT_Library_Version = GetProcAddress(ft_handle, "FT_Library_Version"); + pFT_Load_Sfnt_Table = GetProcAddress(ft_handle, "FT_Load_Sfnt_Table"); + pFT_Get_First_Char = GetProcAddress(ft_handle, "FT_Get_First_Char"); + pFT_Get_Next_Char = GetProcAddress(ft_handle, "FT_Get_Next_Char"); + pFT_Get_TrueType_Engine_Type = GetProcAddress(ft_handle, "FT_Get_TrueType_Engine_Type"); #ifdef HAVE_FREETYPE_FTLCDFIL_H - pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); + pFT_Library_SetLcdFilter = GetProcAddress(ft_handle, "FT_Library_SetLcdFilter"); #endif #ifdef HAVE_FREETYPE_FTWINFNT_H - pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); + pFT_Get_WinFNT_Header = GetProcAddress(ft_handle, "FT_Get_WinFNT_Header"); #endif - if(!wine_dlsym(ft_handle, "FT_Get_Postscript_Name", NULL, 0) && - !wine_dlsym(ft_handle, "FT_Sqrt64", NULL, 0)) { + if(!GetProcAddress(ft_handle, "FT_Get_Postscript_Name") && + !GetProcAddress(ft_handle, "FT_Sqrt64")) { /* try to avoid 2.0.4: >= 2.0.5 has FT_Get_Postscript_Name and <= 2.0.3 has FT_Sqrt64 */ goto sym_not_found; @@ -2695,7 +2790,7 @@ if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); - wine_dlclose(ft_handle, NULL, 0); + FreeLibrary(ft_handle); ft_handle = NULL; return FALSE; } @@ -2722,7 +2817,7 @@ "font library. To enable Wine to use TrueType fonts please upgrade\n" "FreeType to at least version 2.0.5.\n" "http://www.freetype.org\n"); - wine_dlclose(ft_handle, NULL, 0); + FreeLibrary(ft_handle); ft_handle = NULL; return FALSE; } @@ -2764,13 +2859,10 @@ /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); strcatW(windowsdir, fontsW); - if((unixname = wine_get_unix_file_name(windowsdir))) - { - ReadFontDir(unixname, FALSE); - HeapFree(GetProcessHeap(), 0, unixname); - } + ReadFontDir(windowsdir, FALSE); /* load the system truetype fonts */ +#if 0 data_dir = wine_get_data_dir(); if (!data_dir) data_dir = wine_get_build_dir(); if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { @@ -2779,11 +2871,13 @@ ReadFontDir(unixname, TRUE); HeapFree(GetProcessHeap(), 0, unixname); } +#endif /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their full path as the entry. Also look for any .fon fonts, since ReadFontDir will skip these. */ +#if 0 if(RegOpenKeyW(HKEY_LOCAL_MACHINE, is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, &hkey) == ERROR_SUCCESS) { @@ -2802,11 +2896,7 @@ &dlen) == ERROR_SUCCESS) { if(data[0] && (data[1] == ':')) { - if((unixname = wine_get_unix_file_name(data))) - { - AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); - HeapFree(GetProcessHeap(), 0, unixname); - } + AddFontFileToList(data, NULL, NULL, ADDFONT_FORCE_BITMAP); } else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) { @@ -2815,11 +2905,7 @@ BOOL added = FALSE; sprintfW(pathW, fmtW, windowsdir, data); - if((unixname = wine_get_unix_file_name(pathW))) - { - added = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); - HeapFree(GetProcessHeap(), 0, unixname); - } + added = AddFontFileToList(pathW, NULL, NULL, ADDFONT_FORCE_BITMAP); if (!added) load_font_from_data_dir(data); } @@ -2832,11 +2918,12 @@ HeapFree(GetProcessHeap(), 0, valueW); RegCloseKey(hkey); } - +#endif load_fontconfig_fonts(); /* then look in any directories that we've specified in the config file */ /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ +#if 0 if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) == ERROR_SUCCESS) { DWORD len; @@ -2849,9 +2936,9 @@ valueW = HeapAlloc( GetProcessHeap(), 0, len ); if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) { - len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, valueW, -1, NULL, 0, NULL, NULL ); valueA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, valueW, -1, valueA, len, NULL, NULL ); TRACE( "got font path %s\n", debugstr_a(valueA) ); ptr = valueA; while (ptr) @@ -2867,6 +2954,7 @@ } RegCloseKey(hkey); } +#endif DumpFontList(); LoadSubstList(); @@ -2925,52 +3013,57 @@ static struct font_mapping *map_font_file( const char *name ) { struct font_mapping *mapping; - struct stat st; - int fd; - - if ((fd = open( name, O_RDONLY )) == -1) return NULL; - if (fstat( fd, &st ) == -1) goto error; + //struct stat st; + HANDLE file, mapped_file; + + file = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0 ); + if (!file) return NULL; LIST_FOR_EACH_ENTRY( mapping, &mappings_list, struct font_mapping, entry ) { +#if 0 if (mapping->dev == st.st_dev && mapping->ino == st.st_ino) { mapping->refcount++; - close( fd ); + CloseHandle( file ); return mapping; } +#endif } if (!(mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(*mapping) ))) goto error; - mapping->data = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 ); - close( fd ); - - if (mapping->data == MAP_FAILED) + mapped_file = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + mapping->data = MapViewOfFile(mapped_file, FILE_MAP_READ, 0, 0, 0); + CloseHandle( file ); + + if (mapping->data == NULL) { HeapFree( GetProcessHeap(), 0, mapping ); return NULL; } mapping->refcount = 1; - mapping->dev = st.st_dev; - mapping->ino = st.st_ino; - mapping->size = st.st_size; + //mapping->dev = st.st_dev; + //mapping->ino = st.st_ino; + //mapping->size = st.st_size; list_add_tail( &mappings_list, &mapping->entry ); return mapping; error: - close( fd ); + CloseHandle( file ); return NULL; } static void unmap_font_file( struct font_mapping *mapping ) { +#if 0 if (!--mapping->refcount) { list_remove( &mapping->entry ); munmap( mapping->data, mapping->size ); HeapFree( GetProcessHeap(), 0, mapping ); } +#endif } static LONG load_VDMX(GdiFont*, LONG); Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -2,6 +2,7 @@ <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">dll/3rdparty/freetype/include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -8,18 +8,25 @@ @ stdcall AddFontResourceW(wstr) @ stdcall AngleArc(long long long long long long) @ stdcall AnimatePalette(long long long ptr) -# @ stub AnyLinkedFonts +@ stub AnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @ stdcall ArcTo(long long long long long long long long long) +@ stub BRUSHOBJ_hGetColorTransform +@ stub BRUSHOBJ_pvAllocRbrush +@ stub BRUSHOBJ_pvGetRbrush +@ stub BRUSHOBJ_ulGetBrushColor @ stdcall BeginPath(long) @ stdcall BitBlt(long long long long long long long long long) @ stub ByeByeGDI +@ stub CLIPOBJ_bEnum +@ stub CLIPOBJ_cEnumStart +@ stub CLIPOBJ_ppoGetPath @ stdcall CancelDC(long) @ stub CheckColorsInGamut @ stdcall ChoosePixelFormat(long ptr) @ stdcall Chord(long long long long long long long long long) -# @ stub ClearBitmapAttributes -# @ stub ClearBrushAttributes +@ stub ClearBitmapAttributes +@ stub ClearBrushAttributes @ stdcall CloseEnhMetaFile(long) @ stdcall CloseFigure(long) @ stdcall CloseMetaFile(long) @@ -51,8 +58,8 @@ @ stdcall CreateEnhMetaFileW(long wstr ptr wstr) @ stdcall CreateFontA(long long long long long long long long long long long long long str) @ stdcall CreateFontIndirectA(ptr) -# @ stub CreateFontIndirectExA -# @ stub CreateFontIndirectExW +@ stub CreateFontIndirectExA +@ stub CreateFontIndirectExW @ stdcall CreateFontIndirectW(ptr) @ stdcall CreateFontW(long long long long long long long long long long long long long wstr) @ stdcall CreateHalftonePalette(long) @@ -74,6 +81,63 @@ @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) @ stdcall DPtoLP(long ptr long) +@ stub DdEntry0 +@ stub DdEntry10 +@ stub DdEntry11 +@ stub DdEntry12 +@ stub DdEntry13 +@ stub DdEntry14 +@ stub DdEntry15 +@ stub DdEntry16 +@ stub DdEntry17 +@ stub DdEntry18 +@ stub DdEntry19 +@ stub DdEntry1 +@ stub DdEntry20 +@ stub DdEntry21 +@ stub DdEntry22 +@ stub DdEntry23 +@ stub DdEntry24 +@ stub DdEntry25 +@ stub DdEntry26 +@ stub DdEntry27 +@ stub DdEntry28 +@ stub DdEntry29 +@ stub DdEntry2 +@ stub DdEntry30 +@ stub DdEntry31 +@ stub DdEntry32 +@ stub DdEntry33 +@ stub DdEntry34 +@ stub DdEntry35 +@ stub DdEntry36 +@ stub DdEntry37 +@ stub DdEntry38 +@ stub DdEntry39 +@ stub DdEntry3 +@ stub DdEntry40 +@ stub DdEntry41 +@ stub DdEntry42 +@ stub DdEntry43 +@ stub DdEntry44 +@ stub DdEntry45 +@ stub DdEntry46 +@ stub DdEntry47 +@ stub DdEntry48 +@ stub DdEntry49 +@ stub DdEntry4 +@ stub DdEntry50 +@ stub DdEntry51 +@ stub DdEntry52 +@ stub DdEntry53 +@ stub DdEntry54 +@ stub DdEntry55 +@ stub DdEntry56 +@ stub DdEntry5 +@ stub DdEntry6 +@ stub DdEntry7 +@ stub DdEntry8 +@ stub DdEntry9 @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) @ stdcall DeleteEnhMetaFile(long) @@ -87,9 +151,55 @@ @ stdcall Ellipse(long long long long long) @ stdcall EnableEUDC(long) @ stdcall EndDoc(long) -# @ stub EndFormPage +@ stub EndFormPage @ stdcall EndPage(long) @ stdcall EndPath(long) +@ stub EngAcquireSemaphore +@ stub EngAlphaBlend +@ stub EngAssociateSurface +@ stub EngBitBlt +@ stub EngCheckAbort +@ stub EngComputeGlyphSet +@ stub EngCopyBits +@ stub EngCreateBitmap +@ stub EngCreateClip +@ stub EngCreateDeviceBitmap +@ stub EngCreateDeviceSurface +@ stub EngCreatePalette +@ stub EngCreateSemaphore +@ stub EngDeleteClip +@ stub EngDeletePalette +@ stub EngDeletePath +@ stub EngDeleteSemaphore +@ stub EngDeleteSurface +@ stub EngEraseSurface +@ stub EngFillPath +@ stub EngFindResource +@ stub EngFreeModule +@ stub EngGetCurrentCodePage +@ stub EngGetDriverName +@ stub EngGetPrinterDataFileName +@ stub EngGradientFill +@ stub EngLineTo +@ stub EngLoadModule +@ stub EngLockSurface +@ stub EngMarkBandingSurface +@ stub EngMultiByteToUnicodeN +@ stub EngMultiByteToWideChar +@ stub EngPaint +@ stub EngPlgBlt +@ stub EngQueryEMFInfo +@ stub EngQueryLocalTime +@ stub EngReleaseSemaphore +@ stub EngStretchBlt +@ stub EngStretchBltROP +@ stub EngStrokeAndFillPath +@ stub EngStrokePath +@ stub EngTextOut +@ stub EngTransparentBlt +@ stub EngUnicodeToMultiByteN +@ stub EngUnlockSurface +@ stub EngWideCharToMultiByte @ stdcall EnumEnhMetaFile(long long ptr ptr ptr) @ stdcall EnumFontFamiliesA(long str ptr long) @ stdcall EnumFontFamiliesExA(long ptr ptr long long) @@ -103,8 +213,8 @@ @ stdcall EnumObjects(long long ptr long) @ stdcall EqualRgn(long long) @ stdcall Escape(long long long ptr ptr) -# @ stub EudcLoadLinkW -# @ stub EudcUnloadLinkW +@ stub EudcLoadLinkW +@ stub EudcUnloadLinkW @ stdcall ExcludeClipRect(long long long long long) @ stdcall ExtCreatePen(long long ptr long ptr) @ stdcall ExtCreateRegion(ptr long ptr) @@ -113,6 +223,14 @@ @ stdcall ExtSelectClipRgn(long long long) @ stdcall ExtTextOutA(long long long long ptr str long ptr) @ stdcall ExtTextOutW(long long long long ptr wstr long ptr) +@ stub FONTOBJ_cGetAllGlyphHandles +@ stub FONTOBJ_cGetGlyphs +@ stub FONTOBJ_pQueryGlyphAttrs +@ stub FONTOBJ_pfdg +@ stub FONTOBJ_pifi +@ stub FONTOBJ_pvTrueTypeFontFile +@ stub FONTOBJ_pxoGetXform +@ stub FONTOBJ_vGetInfo @ stdcall FillPath(long) @ stdcall FillRgn(long long long) @ stdcall FixBrushOrgEx(long long long ptr) @@ -121,18 +239,18 @@ @ stdcall FontIsLinked(long) @ stdcall FrameRgn(long long long long long) @ stub FreeImageColorMatcher -# @ stub GdiAddFontResourceW -# @ stub GdiAddGlsBounds -# @ stub GdiAddGlsRecord +@ stdcall GdiAddFontResourceW(ptr ptr ptr) +@ stub GdiAddGlsBounds +@ stub GdiAddGlsRecord @ stdcall GdiAlphaBlend(long long long long long long long long long long long) -# @ stub GdiArtificialDecrementDriver +@ stub GdiArtificialDecrementDriver @ stub GdiAssociateObject @ stub GdiCleanCacheDC @ stdcall GdiComment(long long ptr) -# @ stub GdiConsoleTextOut +@ stub GdiConsoleTextOut @ stub GdiConvertAndCheckDC @ stub GdiConvertBitmap -# @ stub GdiConvertBitmapV5 +@ stub GdiConvertBitmapV5 @ stub GdiConvertBrush @ stub GdiConvertDC @ stub GdiConvertEnhMetaFile @@ -161,71 +279,87 @@ @ stub GdiDciSetDestination @ stub GdiDeleteLocalDC @ stub GdiDeleteLocalObject -# @ stub GdiDeleteSpoolFileHandle -# @ stub GdiDescribePixelFormat +@ stub GdiDeleteSpoolFileHandle +@ stub GdiDescribePixelFormat @ stub GdiDllInitialize -# @ stub GdiDrawStream -# @ stub GdiEndDocEMF -# @ stub GdiEndPageEMF -# @ stub GdiFixUpHandle +@ stub GdiDrawStream +@ stub GdiEndDocEMF +@ stub GdiEndPageEMF +@ stub GdiEntry10 +@ stub GdiEntry11 +@ stub GdiEntry12 +@ stub GdiEntry13 +@ stub GdiEntry14 +@ stub GdiEntry15 +@ stub GdiEntry16 +@ stub GdiEntry1 +@ stub GdiEntry2 +@ stub GdiEntry3 +@ stub GdiEntry4 +@ stub GdiEntry5 +@ stub GdiEntry6 +@ stub GdiEntry7 +@ stub GdiEntry8 +@ stub GdiEntry9 +@ stub GdiFixUpHandle @ stdcall GdiFlush() -# @ stub GdiFullscreenControl +@ stub GdiFullscreenControl @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long) -# @ stub GdiGetDC -# @ stub GdiGetDevmodeForPage +@ stub GdiGetDC +@ stub GdiGetDevmodeForPage @ stub GdiGetLocalBitmap @ stub GdiGetLocalBrush @ stub GdiGetLocalDC @ stub GdiGetLocalFont -# @ stub GdiGetPageCount -# @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle +@ stub GdiGetPageCount +@ stub GdiGetPageHandle +@ stub GdiGetSpoolFileHandle @ stdcall GdiGetSpoolMessage(ptr long ptr long) @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() -# @ stub GdiInitializeLanguagePack +@ stub GdiInitializeLanguagePack @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) @ stub GdiPlayDCScript -# @ stub GdiPlayEMF +@ stub GdiPlayEMF @ stub GdiPlayJournal -# @ stub GdiPlayPageEMF -# @ stub GdiPlayPrivatePageEMF +@ stub GdiPlayPageEMF +@ stub GdiPlayPrivatePageEMF @ stub GdiPlayScript -# @ stub GdiPrinterThunk -# @ stub GdiProcessSetup -# @ stub GdiQueryFonts -# @ stub GdiQueryTable +@ stub GdiPrinterThunk +@ stub GdiProcessSetup +@ stub GdiQueryFonts +@ stub GdiQueryTable @ stdcall GdiRealizationInfo(long ptr) -# @ stub GdiReleaseDC +@ stub GdiReleaseDC @ stub GdiReleaseLocalDC -# @ stub GdiResetDCEMF +@ stub GdiResetDCEMF @ stub GdiSetAttrs @ stdcall GdiSetBatchLimit(long) -# @ stub GdiSetLastError -# @ stub GdiSetPixelFormat +@ stub GdiSetLastError +@ stub GdiSetPixelFormat @ stub GdiSetServerAttr -# @ stub GdiStartDocEMF -# @ stub GdiStartPageEMF -# @ stub GdiSwapBuffers +@ stub GdiStartDocEMF +@ stub GdiStartPageEMF +@ stub GdiSwapBuffers @ stdcall GdiTransparentBlt(long long long long long long long long long long long) -# @ stub GdiValidateHandle +@ stub GdiValidateHandle @ stub GdiWinWatchClose @ stub GdiWinWatchDidStatusChange @ stub GdiWinWatchGetClipList @ stub GdiWinWatchOpen @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) -# @ stub GetBitmapAttributes +@ stub GetBitmapAttributes @ stdcall GetBitmapBits(long long ptr) @ stdcall GetBitmapDimensionEx(long ptr) @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) -# @ stub GetBrushAttributes +@ stub GetBrushAttributes @ stdcall GetBrushOrgEx(long ptr) @ stdcall GetCharABCWidthsA(long long long ptr) @ stdcall GetCharABCWidthsFloatA(long long long ptr) @@ -238,7 +372,7 @@ @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) @ stdcall GetCharWidthI(ptr long long ptr ptr) -# @ stub GetCharWidthInfo +@ stub GetCharWidthInfo @ stdcall GetCharWidthW(long long long long) GetCharWidth32W @ stub GetCharWidthWOW @ stdcall GetCharacterPlacementA(long str long long ptr long) @@ -257,17 +391,17 @@ @ stdcall GetDeviceCaps(long long) @ stdcall GetDeviceGammaRamp(long ptr) @ stub GetETM -# @ stub GetEUDCTimeStamp -# @ stub GetEUDCTimeStampExW +@ stub GetEUDCTimeStamp +@ stub GetEUDCTimeStampExW @ stdcall GetEnhMetaFileA(str) @ stdcall GetEnhMetaFileBits(long long ptr) @ stdcall GetEnhMetaFileDescriptionA(long long ptr) @ stdcall GetEnhMetaFileDescriptionW(long long ptr) @ stdcall GetEnhMetaFileHeader(long long ptr) @ stdcall GetEnhMetaFilePaletteEntries (long long ptr) -# @ stub GetEnhMetaFilePixelFormat +@ stub GetEnhMetaFilePixelFormat @ stdcall GetEnhMetaFileW(wstr) -# @ stub GetFontAssocStatus +@ stub GetFontAssocStatus @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo @@ -280,7 +414,7 @@ @ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) @ stub GetGlyphOutlineWow @ stdcall GetGraphicsMode(long) -# @ stub GetHFONT +@ stub GetHFONT @ stdcall GetICMProfileA(long ptr ptr) @ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @@ -315,8 +449,8 @@ @ stdcall GetRgnBox(long ptr) @ stdcall GetStockObject(long) @ stdcall GetStretchBltMode(long) -# @ stub GetStringBitmapA -# @ stub GetStringBitmapW +@ stub GetStringBitmapA +@ stub GetStringBitmapW @ stdcall GetSystemPaletteEntries(long long long ptr) @ stdcall GetSystemPaletteUse(long) @ stdcall GetTextAlign(long) @@ -327,14 +461,14 @@ @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) @ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) @ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) -# @ stub GetTextExtentExPointWPri +@ stub GetTextExtentExPointWPri @ stdcall GetTextExtentPoint32A(long str long ptr) @ stdcall GetTextExtentPoint32W(long wstr long ptr) @ stdcall GetTextExtentPointA(long str long ptr) @ stdcall GetTextExtentPointI(long ptr long ptr) @ stdcall GetTextExtentPointW(long wstr long ptr) @ stdcall GetTextFaceA(long long ptr) -# @ stub GetTextFaceAliasW +@ stub GetTextFaceAliasW @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) @@ -347,15 +481,15 @@ @ stdcall GetWorldTransform(long ptr) @ stdcall IntersectClipRect(long long long long long) @ stdcall InvertRgn(long long) -# @ stub IsValidEnhMetaRecord -# @ stub IsValidEnhMetaRecordOffExt +@ stub IsValidEnhMetaRecord +@ stub IsValidEnhMetaRecordOffExt @ stdcall LPtoDP(long ptr long) @ stdcall LineDDA(long long long long ptr long) @ stdcall LineTo(long long long) @ stub LoadImageColorMatcherA @ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) -# @ stub MirrorRgn +@ stub MirrorRgn @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) @ stdcall NamedEscape(long wstr long long ptr long ptr) @@ -375,7 +509,7 @@ @ stdcall PolyBezier(long ptr long) @ stdcall PolyBezierTo(long ptr long) @ stdcall PolyDraw(long ptr ptr long) -# @ stub PolyPatBlt +@ stub PolyPatBlt @ stdcall PolyPolygon(long ptr ptr long) @ stdcall PolyPolyline(long ptr ptr long) @ stdcall PolyTextOutA(long ptr long) @@ -385,7 +519,7 @@ @ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) @ stdcall PtVisible(long long long) -# @ stub QueryFontAssocStatus +@ stub QueryFontAssocStatus @ stdcall RealizePalette(long) @ stdcall RectInRegion(long ptr) @ stdcall RectVisible(long ptr) @@ -412,13 +546,13 @@ @ stdcall SelectPalette(long long long) @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) -# @ stub SetBitmapAttributes +@ stub SetBitmapAttributes @ stdcall SetBitmapBits(long long ptr) @ stdcall SetBitmapDimensionEx(long long long ptr) @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long) -# @ stub SetBrushAttributes +@ stub SetBrushAttributes @ stdcall SetBrushOrgEx(long long long ptr) @ stdcall SetColorAdjustment(long ptr) @ stdcall SetColorSpace(long long) @@ -435,7 +569,7 @@ @ stdcall SetICMProfileA(long str) @ stdcall SetICMProfileW(long wstr) @ stdcall SetLayout(long long) -# @ stub SetLayoutWidth +@ stub SetLayoutWidth @ stdcall SetMagicColors(ptr long long) @ stdcall SetMapMode(long long) @ stdcall SetMapperFlags(long long) @@ -466,7 +600,7 @@ @ stdcall SetWorldTransform(long ptr) @ stdcall StartDocA(long ptr) @ stdcall StartDocW(long ptr) -# @ stub StartFormPage +@ stub StartFormPage @ stdcall StartPage(long) @ stdcall StretchBlt(long long long long long long long long long long long) @ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) @@ -483,6 +617,9 @@ @ stdcall UpdateICMRegKeyA(long str str long) @ stdcall UpdateICMRegKeyW(long wstr wstr long) @ stdcall WidenPath(long) +@ stub bInitSystemAndFontsDirectoriesW +@ stub bMakePathNameW +@ stub cGetTTFFromFOT @ stub gdiPlaySpoolStream @ extern pfnRealizePalette @ extern pfnSelectPalette Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -516,5 +516,23 @@ BOOL WINAPI FontIsLinked(HDC); BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size); +NTSYSAPI +VOID +NTAPI +RtlAssert( + PVOID FailedAssertion, + PVOID FileName, + ULONG LineNumber, + PCHAR Message +); + +#ifdef assert +#undef assert +#endif +#define assert(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } + +#ifndef ASSERT +#define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +#endif #endif /* __WINE_GDI_PRIVATE_H */ Modified: branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c [iso-8859-1] Sat Jul 18 10:29:27 2009 @@ -492,6 +492,7 @@ static DWORD get_dpi( void ) { DWORD dpi = 96; +#if 0 HKEY hkey; if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) @@ -506,6 +507,7 @@ } RegCloseKey(hkey); } +#endif return dpi; }

1 0

[fireball] 42024: - Fix user32 compiling/linking. - Add missing function declarations to winuser.h
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 23:29:46 2009 New Revision: 42024 URL: http://svn.reactos.org/svn/reactos?rev=42024&view=rev Log: - Fix user32 compiling/linking. - Add missing function declarations to winuser.h Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h branches/arwinss/reactos/include/psdk/winuser.h branches/arwinss/reactos/include/reactos/wine/server.h Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Fri Jul 17 23:29:46 2009 @@ -32,7 +32,7 @@ #include "wine/winbase16.h" extern WORD USER_HeapSel DECLSPEC_HIDDEN; - +NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); static inline HLOCAL16 LOCAL_Alloc( HANDLE16 ds, UINT16 flags, WORD size ) { DbgPrint("LOCAL_Alloc unimplemented!\n"); Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 17 23:29:46 2009 @@ -3810,6 +3810,7 @@ long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO); #endif /* (_WIN32_WINNT >= 0x0501) */ +void WINAPI CalcChildScroll(HWND, INT); BOOL WINAPI CallMsgFilterA(LPMSG,INT); BOOL WINAPI CallMsgFilterW(LPMSG,INT); LRESULT WINAPI CallNextHookEx(HHOOK,int,WPARAM,LPARAM); @@ -4215,6 +4216,7 @@ BOOL WINAPI IsZoomed(HWND); VOID WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR); BOOL WINAPI KillTimer(HWND,UINT_PTR); +BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR); HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR); HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR); @@ -4325,6 +4327,7 @@ HANDLE WINAPI RemovePropW(HWND,LPCWSTR); BOOL WINAPI ReplyMessage(LRESULT); BOOL WINAPI ScreenToClient(HWND,LPPOINT); +VOID WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM); BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT); BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT); int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT); @@ -4360,6 +4363,7 @@ HCURSOR WINAPI SetCursor(HCURSOR); BOOL WINAPI SetCursorPos(int,int); VOID WINAPI SetDebugErrorLevel(DWORD); +BOOL WINAPI SetDeskWallPaper(LPCSTR); BOOL WINAPI SetDlgItemInt(HWND,int,UINT,BOOL); BOOL WINAPI SetDlgItemTextA(HWND,int,LPCSTR); BOOL WINAPI SetDlgItemTextW(HWND,int,LPCWSTR); @@ -4395,6 +4399,7 @@ BOOL WINAPI SetSystemMenu(HWND,HMENU); BOOL WINAPI SetThreadDesktop(HDESK); UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI SetUserObjectInformationA(HANDLE,int,PVOID,DWORD); BOOL WINAPI SetUserObjectInformationW(HANDLE,int,PVOID,DWORD); BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR); Modified: branches/arwinss/reactos/include/reactos/wine/server.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] Fri Jul 17 23:29:46 2009 @@ -49,7 +49,11 @@ struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -W32KAPI UINT APIENTRY wine_server_call(void *req_ptr); +#ifndef W32KAPI +#define W32KAPI DECLSPEC_ADDRSAFE +#endif + +W32KAPI unsigned int APIENTRY wine_server_call(void *req_ptr); extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options );

1 0

[fireball] 42023: - Make win32k compile. - Add "wine_server_call" system entry. - Adapt Wine's server.h to use it.
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 23:19:09 2009 New Revision: 42023 URL: http://svn.reactos.org/svn/reactos?rev=42023&view=rev Log: - Make win32k compile. - Add "wine_server_call" system entry. - Adapt Wine's server.h to use it. Modified: branches/arwinss/reactos/include/reactos/wine/server.h branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/include/reactos/wine/server.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/server.h [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -49,7 +49,7 @@ struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int wine_server_call( void *req_ptr ); +W32KAPI UINT APIENTRY wine_server_call(void *req_ptr); extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/init.c [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -146,6 +146,14 @@ { UNIMPLEMENTED; return STATUS_SUCCESS; +} + +NTSTATUS +APIENTRY +NtGdiFlushUserBatch(VOID) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; } /* DRIVER ENTRYPOINT *********************************************************/ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -11,9 +11,9 @@ /* Version Data */ #undef __MSVCRT__ #include <psdk/ntverp.h> -#define _WIN32_WINNT _WIN32_WINNT_WS03 +//#define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1 -#define WINVER 0x600 +//#define WINVER 0x600 /* Initial DDK/IFS Headers */ #ifdef _MSC_VER @@ -54,21 +54,21 @@ #include <ntndk.h> /* SEH Support with PSEH */ -#include <pseh/pseh.h> +#include <pseh/pseh2.h> /* CSRSS Header */ #include <csrss/csrss.h> /* Helper Header */ -#include <reactos/helper.h> +//#include <reactos/helper.h> /* Probe and capture */ -#include <reactos/probe.h> +//#include <reactos/probe.h> /* Public Win32K Headers */ #include <win32k/callback.h> #include <win32k/ntusrtyp.h> -#include <win32k/ntuser.h> +//#include <win32k/ntuser.h> #include <win32k/ntgdityp.h> #include <win32k/ntgdihdl.h> #define LANGPACK Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -12,11 +12,7 @@ /* INCLUDES ******************************************************************/ /* Prototypes */ -NTSTATUS -APIENTRY -NtGdiFlushUserBatch( - VOID -); +W32KAPI UINT APIENTRY wine_server_call(void *req_ptr); /* Internal Win32K Headers */ //#include <gdiobj.h> Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -1,1 +1,1 @@ -ServDoNothing 1 +wine_server_call 1 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Jul 17 23:19:09 2009 @@ -19,6 +19,9 @@ <directory name="gre"> <file>init.c</file> </directory> + <directory name="wine"> + <file>main.c</file> + </directory> <file>win32k.rc</file> </module> </group>

1 0

[fireball] 42000: - Create a branch for upcoming work. "<XXX> people will eat you alive anyway so it doesn't really matter"
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 14:49:16 2009 New Revision: 42000 URL: http://svn.reactos.org/svn/reactos?rev=42000&view=rev Log: - Create a branch for upcoming work. "<XXX> people will eat you alive anyway so it doesn't really matter" Added: branches/arwinss/ - copied from r41999, trunk/

2 1

← Newer
1
...
27
28
29
30
31
32
33
...
61
Older →

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 July 2009