Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23088: Start implement code that alex for one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 16 23:03:46 2006 New Revision: 23088 URL: http://svn.reactos.org/svn/reactos?rev=23088&view=rev Log: Start implement code that alex for one year ago, thanks alex for all help and for all code he wrote. and sorry for the mess at moment in the file. it will be pretty large update to this file, for the patch have been lying on my harddisk for some time. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Jul 16 23:03:46 2006 @@ -1,36 +1,112 @@ /* - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* - * $Id: * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GDI32 - * PURPOSE: Gdi DirectX inteface + * PURPOSE: GDI DirectX inteface * FILE: lib/gdi32/misc/gdientry.c - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - * REVISION HISTORY: - * NOTES: - */ - + * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) + * Magnus Olsen (magnus(a)greatlord.com) + */ + +/* INCLUDES ******************************************************************/ #include "precomp.h" #include <ddraw.h> #include <ddrawi.h> #include <ddrawint.h> #include <ddrawgdi.h> + +/* DATA **********************************************************************/ + +HANDLE ghDirectDraw; +ULONG gcDirectDraw; + +#define GetDdHandle(Handle) (Handle ? Handle : ghDirectDraw) + + +/* CALLBACKS *****************************************************************/ + +/* + * Dd Surface Callbacks + */ +DWORD +WINAPI +DdAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA Attach) +{ + /* Call win32k */ + return NtGdiDdAddAttachedSurface((HANDLE)Attach->lpDDSurface->hDDSurface, + (HANDLE)Attach->lpSurfAttached->hDDSurface, + (PDD_ADDATTACHEDSURFACEDATA)Attach); +} + +DWORD +WINAPI +DdBlt(LPDDHAL_BLTDATA Blt) +{ + HANDLE Surface = 0; + + /* Use the right surface */ + if (Blt->lpDDSrcSurface) Surface = (HANDLE)Blt->lpDDSrcSurface->hDDSurface; + + /* Call win32k */ + return NtGdiDdBlt((HANDLE)Blt->lpDDDestSurface->hDDSurface, Surface, (PDD_BLTDATA)Blt); +} + +DWORD +APIENTRY +DdDestroySurface(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) +{ + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + BOOL RealDestroy = TRUE; + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal; + + /* Get the local surface */ + pSurfaceLocal = pDestroySurface->lpDDSurface; + + /* Make sure there's a surface */ + if (pSurfaceLocal->hDDSurface) + { + /* Check if we shoudl really destroy it */ + if ((pSurfaceLocal->dwFlags & DDRAWISURF_DRIVERMANAGED) && + (pSurfaceLocal->dwFlags & DDRAWISURF_INVALID)) + { + RealDestroy = FALSE; + } + + /* Call win32k */ + Return = NtGdiDdDestroySurface((HANDLE)pSurfaceLocal->hDDSurface, + RealDestroy); + } + + return Return; +} + +DWORD +WINAPI +DdFlip(LPDDHAL_FLIPDATA Flip) +{ + /* Call win32k */ + + return NtGdiDdFlip( (HANDLE)Flip->lpSurfCurr->hDDSurface, + (HANDLE)Flip->lpSurfTarg->hDDSurface, + /* FIXME the two last should be current left handler */ + (HANDLE)Flip->lpSurfCurr->hDDSurface, + (HANDLE)Flip->lpSurfTarg->hDDSurface, + (PDD_FLIPDATA)Flip); +} + +WORD +WINAPI +DdLock(LPDDHAL_LOCKDATA Lock) +{ + /* Call win32k */ + return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, + (PDD_LOCKDATA)Lock, + (HANDLE)Lock->lpDDSurface->hDC); +} + + + + static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0;

18 years, 2 months

[greatlrd] 23087: start implement of gdientry2, for moment it return incorrect info. and does not fill some stuff right. we are return alot of kernel pointer and does not setup alot stuff right, see it as start ground. I do not want lose this start code again. it will be add in modifcate alot.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 16 22:12:13 2006 New Revision: 23087 URL: http://svn.reactos.org/svn/reactos?rev=23087&view=rev Log: start implement of gdientry2, for moment it return incorrect info. and does not fill some stuff right. we are return alot of kernel pointer and does not setup alot stuff right, see it as start ground. I do not want lose this start code again. it will be add in modifcate alot. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Jul 16 22:12:13 2006 @@ -115,8 +115,34 @@ LPDWORD pdwFourCC, LPVIDMEM pvmList) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + BOOL bStatus = FALSE; + DD_HALINFO DDHalInfo; + LPVOID pCallBackFlags[3]; + DWORD NumHeaps; + DWORD NumFourCC; + + DDHalInfo.dwSize = sizeof(DD_HALINFO); + + pCallBackFlags[0] = pDDCallbacks; + pCallBackFlags[1] = pDDSurfaceCallbacks; + pCallBackFlags[2] = pDDPaletteCallbacks; + + bStatus = NtGdiDdQueryDirectDrawObject( + (HANDLE)pDirectDrawGlobal->hDD, + (DD_HALINFO *)&DDHalInfo, + (DWORD *)pCallBackFlags, + (LPD3DNTHAL_CALLBACKS)pD3dCallbacks, + (LPD3DNTHAL_GLOBALDRIVERDATA)pD3dDriverData, + (PDD_D3DBUFCALLBACKS)pD3dBufferCallbacks, + (LPDDSURFACEDESC)pD3dTextureFormats, + (DWORD *)&NumHeaps, + (VIDEOMEMORY *)pvmList, + (DWORD *)&NumFourCC, + (DWORD *)pdwFourCC); + + + //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return bStatus; } /*

18 years, 2 months

[fireball] 23086: [AUDIT] fmifs.dll It is completely clean, because it's only stubs without any code. The only pair of coded functions are trivial "pass-through"/wrappers.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jul 16 21:38:03 2006 New Revision: 23086 URL: http://svn.reactos.org/svn/reactos?rev=23086&view=rev Log: [AUDIT] fmifs.dll It is completely clean, because it's only stubs without any code. The only pair of coded functions are trivial "pass-through"/wrappers. Modified: trunk/reactos/dll/win32/fmifs/chkdsk.c (props changed) trunk/reactos/dll/win32/fmifs/compress.c (props changed) trunk/reactos/dll/win32/fmifs/diskcopy.c (props changed) trunk/reactos/dll/win32/fmifs/extend.c (props changed) trunk/reactos/dll/win32/fmifs/fmifs.def (props changed) trunk/reactos/dll/win32/fmifs/fmifs.rc (props changed) trunk/reactos/dll/win32/fmifs/format.c (props changed) trunk/reactos/dll/win32/fmifs/init.c (props changed) trunk/reactos/dll/win32/fmifs/label.c (props changed) trunk/reactos/dll/win32/fmifs/media.c (props changed) trunk/reactos/dll/win32/fmifs/precomp.h (props changed) Propchange: trunk/reactos/dll/win32/fmifs/chkdsk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/compress.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/diskcopy.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/extend.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/fmifs.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/fmifs.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/format.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/label.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/media.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/fmifs/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 2 months

[ion] 23085: - Added constants for all the ETHREAD flags so when we use Interlocked operations to edit them, a nice symbolic name is there isntead of a magic hex value. - Fixed a bug in PspUserThreadStartup which was causing us to notify the debugger for system threads or hidden threads, instead of vice-versa. - Documented cookie generation for Thomas. - Threads were incorrectly created with KernelMode access instead of PreviousMode. - Initialize the thread's rundown protection and use the proce

by ion＠svn.reactos.org

Author: ion Date: Sun Jul 16 21:19:21 2006 New Revision: 23085 URL: http://svn.reactos.org/svn/reactos?rev=23085&view=rev Log: - Added constants for all the ETHREAD flags so when we use Interlocked operations to edit them, a nice symbolic name is there isntead of a magic hex value. - Fixed a bug in PspUserThreadStartup which was causing us to notify the debugger for system threads or hidden threads, instead of vice-versa. - Documented cookie generation for Thomas. - Threads were incorrectly created with KernelMode access instead of PreviousMode. - Initialize the thread's rundown protection and use the process's. - Handle failure when TEB = NULL. - The LPC Semaphore has a limit of 1, not 0x7FFF. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Jul 16 21:19:21 2006 @@ -97,9 +97,9 @@ #define PS_INHERIT_HANDLES 4 #define PS_UNKNOWN_VALUE 8 #define PS_ALL_FLAGS (PS_REQUEST_BREAKAWAY | \ - PS_NO_DEBUG_INHERIT | \ - PS_INHERIT_HANDLES | \ - PS_UNKNOWN_VALUE) + PS_NO_DEBUG_INHERIT | \ + PS_INHERIT_HANDLES | \ + PS_UNKNOWN_VALUE) // // Process base priorities @@ -139,7 +139,6 @@ 0xFFF) #endif - // // Job Access Types // @@ -151,6 +150,34 @@ #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ 31) + +// +// Cross Thread Flags +// +#define CT_TERMINATED_BIT 0x1 +#define CT_DEAD_THREAD_BIT 0x2 +#define CT_HIDE_FROM_DEBUGGER_BIT 0x4 +#define CT_ACTIVE_IMPERSTIONATION_INFO_BIT 0x8 +#define CT_SYSTEM_THREAD_BIT 0x10 +#define CT_HARD_ERRORS_ARE_DISABLED_BIT 0x20 +#define CT_BREAK_ON_TERMINATION_BIT 0x40 +#define CT_SKIP_CREATION_MSG_BIT 0x80 +#define CT_SKIP_TERMINATION_MSG_BIT 0x100 + +// +// Same Thread Passive Flags +// +#define STP_ACTIVE_EX_WORKER_BIT 0x1 +#define STP_EX_WORKER_CAN_WAIT_USER_BIT 0x2 +#define STP_MEMORY_MAKER_BIT 0x4 +#define STP_KEYED_EVENT_IN_USE_BIT 0x8 + +// +// Same Thread APC Flags +// +#define STA_LPC_RECEIVED_MSG_ID_VALID_BIT 0x1 +#define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 +#define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #endif #ifdef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sun Jul 16 21:19:21 2006 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/ps/thread.c * PURPOSE: Process Manager: Thread Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Thomas Weidenmueller (w3seek(a)reactos.org + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* @@ -66,9 +66,9 @@ } /* Check if this is a system thread, or if we're hiding */ - if ((Thread->SystemThread) || (Thread->HideFromDebugger)) -{ - /* Notify the debugger */ + if (!(Thread->SystemThread) && !(Thread->HideFromDebugger)) + { + /* We're not, so notify the debugger */ DbgkCreateThread(StartContext); } @@ -90,9 +90,9 @@ sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)), PspSystemDllEntryPoint, - NULL, + NULL, PspSystemDllBase, - NULL); + NULL); /* Lower it back to passive */ KeLowerIrql(PASSIVE_LEVEL); @@ -100,13 +100,21 @@ else { /* We're dead, kill us now */ - PspTerminateThreadByPointer(Thread, STATUS_THREAD_IS_TERMINATING, TRUE); + PspTerminateThreadByPointer(Thread, + STATUS_THREAD_IS_TERMINATING, + TRUE); } /* Do we have a cookie set yet? */ if (!SharedUserData->Cookie) { - /* FIXME: Generate cookie */ + /* + * FIXME: Generate cookie + * Formula (roughly): Per-CPU Page Fault ^ Per-CPU Interrupt Time ^ + * Global System Time ^ Stack Address of where + * the LARGE_INTEGER containing the Global System + * Time is. + */ } } @@ -202,7 +210,7 @@ Status = ObCreateObject(PreviousMode, PsThreadType, ObjectAttributes, - KernelMode, + PreviousMode, NULL, sizeof(ETHREAD), 0, @@ -218,6 +226,9 @@ /* Zero the Object entirely */ RtlZeroMemory(Thread, sizeof(ETHREAD)); + /* Initialize rundown protection */ + ExInitializeRundownProtection(&Thread->RundownProtect); + /* Set the Process CID */ Thread->ThreadsProcess = Process; Thread->Cid.UniqueProcess = Process->UniqueProcessId; @@ -228,8 +239,7 @@ Thread->Cid.UniqueThread = ExCreateHandle(PspCidTable, &CidEntry); if (!Thread->Cid.UniqueThread) { - /* We couldn't create the CID, dereference everything and fail */ - ObDereferenceObject(Process); + /* We couldn't create the CID, dereference the thread and fail */ ObDereferenceObject(Thread); return STATUS_INSUFFICIENT_RESOURCES; } @@ -238,7 +248,7 @@ Thread->ReadClusterSize = MmReadClusterSize; /* Initialize the LPC Reply Semaphore */ - KeInitializeSemaphore(&Thread->LpcReplySemaphore, 0, MAXLONG); + KeInitializeSemaphore(&Thread->LpcReplySemaphore, 0, 1); /* Initialize the list heads and locks */ InitializeListHead(&Thread->LpcReplyChain); @@ -247,6 +257,9 @@ InitializeListHead(&Thread->ActiveTimerListHead); KeInitializeSpinLock(&Thread->ActiveTimerListLock); + /* Acquire rundown protection */ + ExAcquireRundownProtection(&Process->RundownProtect); + /* Allocate Stack for non-GUI Thread */ KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; @@ -255,6 +268,13 @@ { /* User-mode Thread, create Teb */ TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); + if (!TebBase) + { + /* Failed to create the TEB. Release rundown and dereference */ + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Thread); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Set the Start Addresses */ Thread->StartAddress = (PVOID)ThreadContext->Eip; @@ -274,7 +294,7 @@ { /* System Thread */ Thread->StartAddress = StartRoutine; - InterlockedOr((PLONG)&Thread->CrossThreadFlags, 0x10); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_SYSTEM_THREAD_BIT); /* Let the kernel intialize the Thread */ KeInitializeThread(&Process->Pcb, @@ -294,6 +314,9 @@ */ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); Process->ActiveThreads++; + + /* Release rundown */ + ExReleaseRundownProtection(&Process->RundownProtect); /* Notify WMI */ //WmiTraceProcess(Process, TRUE);

18 years, 2 months

[hpoussin] 23084: [FORMATTING] Replace tabs by spaces Replace some DPRINT1 by DPRINT

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jul 16 21:00:39 2006 New Revision: 23084 URL: http://svn.reactos.org/svn/reactos?rev=23084&view=rev Log: [FORMATTING] Replace tabs by spaces Replace some DPRINT1 by DPRINT Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sun Jul 16 21:00:39 2006 @@ -60,7 +60,7 @@ { HANDLE Thread; - DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); if (ProcessData->CtrlDispatcher) { @@ -191,7 +191,7 @@ CloseHandle(Console->ActiveEvent); return STATUS_INSUFFICIENT_RESOURCES; } - + if (! GuiMode) { Status = TuiInitConsole(Console); @@ -223,7 +223,7 @@ DeleteCriticalSection(&Console->Header.Lock); CloseHandle(Console->ActiveEvent); HeapFree(Win32CsrApiHeap, 0, NewBuffer); - DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); + DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); return Status; } @@ -310,8 +310,8 @@ if (NewConsole || !ProcessData->bInheritHandles) { /* Insert the Objects */ - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, &Console->Header); if (! NT_SUCCESS(Status)) { @@ -320,15 +320,15 @@ ProcessData->Console = 0; return Request->Status = Status; } - - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, + + Status = Win32CsrInsertObject(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, &Console->ActiveBuffer->Header); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); ConioDeleteConsole((Object_t *) Console); - Win32CsrReleaseObject(ProcessData, + Win32CsrReleaseObject(ProcessData, Request->Data.AllocConsoleRequest.InputHandle); ProcessData->Console = 0; return Request->Status = Status; @@ -336,12 +336,12 @@ } /* Duplicate the Event */ - if (!DuplicateHandle(GetCurrentProcess(), + if (!DuplicateHandle(GetCurrentProcess(), ProcessData->Console->ActiveEvent, - ProcessData->Process, - &ProcessData->ConsoleEvent, - EVENT_ALL_ACCESS, - FALSE, + ProcessData->Process, + &ProcessData->ConsoleEvent, + EVENT_ALL_ACCESS, + FALSE, 0)) { DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); @@ -623,13 +623,13 @@ } else { - /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ + /* otherwise, we will treat the backspace just like any other char and let the client decide what to do */ Console->WaitingChars--; ConioUnlockConsole(Console); HeapFree(Win32CsrApiHeap, 0, Input); Request->Data.ReadConsoleRequest.NrCharactersRead++; Buffer[i] = Input->InputEvent.Event.KeyEvent.uChar.AsciiChar; - return Request->Status; + return Request->Status; } Request->Data.ReadConsoleRequest.nCharsCanBeDeleted--; Input->Echoed = TRUE; /* mark as echoed so we don't echo it below */ @@ -724,7 +724,7 @@ RECT *Rect2) { return ((Rect1->left == Rect2->left) && (Rect1->right == Rect2->right) && - (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom)); + (Rect1->top == Rect2->top) && (Rect1->bottom == Rect2->bottom)); } inline BOOLEAN ConioGetIntersection( @@ -947,7 +947,7 @@ DPRINT("CsrWriteConsole\n"); if (Request->Header.u1.s1.TotalLength - < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE) + (Request->Data.WriteConsoleRequest.NrCharactersToWrite * CharSize)) { DPRINT1("Invalid request size\n"); @@ -956,10 +956,10 @@ return Request->Status = STATUS_INVALID_PARAMETER; } Status = ConioConsoleFromProcessData(ProcessData, &Console); - + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - + if (! NT_SUCCESS(Status)) { return Request->Status = Status; @@ -967,16 +967,16 @@ if(Request->Data.WriteConsoleRequest.Unicode) { - Length = WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, NULL, 0, NULL, NULL); Buffer = RtlAllocateHeap(GetProcessHeap(), 0, Length); if (Buffer) { - WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, - Request->Data.WriteConsoleRequest.NrCharactersToWrite, + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleRequest.Buffer, + Request->Data.WriteConsoleRequest.NrCharactersToWrite, Buffer, Length, NULL, NULL); } else @@ -988,7 +988,7 @@ { Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer; } - + if (Buffer) { Status = ConioLockScreenBuffer(ProcessData, Request->Data.WriteConsoleRequest.ConsoleHandle, &Buff); @@ -1096,11 +1096,11 @@ DPRINT1("Console_Api Ctrl-C\n"); current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); - current_entry = current_entry->Flink; - ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); - } + { + current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + current_entry = current_entry->Flink; + ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); + } HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); return; } @@ -1111,30 +1111,30 @@ || VK_DOWN == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode)) { if (KeyEventRecord->InputEvent.Event.KeyEvent.bKeyDown) - { - /* scroll up or down */ - if (NULL == Console) - { - DPRINT1("No Active Console!\n"); - HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); - return; - } - if (VK_UP == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode) - { - /* only scroll up if there is room to scroll up into */ - if (Console->ActiveBuffer->ShowY != ((Console->ActiveBuffer->CurrentY + 1) % - Console->ActiveBuffer->MaxY)) + { + /* scroll up or down */ + if (NULL == Console) + { + DPRINT1("No Active Console!\n"); + HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); + return; + } + if (VK_UP == KeyEventRecord->InputEvent.Event.KeyEvent.wVirtualKeyCode) + { + /* only scroll up if there is room to scroll up into */ + if (Console->ActiveBuffer->ShowY != ((Console->ActiveBuffer->CurrentY + 1) % + Console->ActiveBuffer->MaxY)) { Console->ActiveBuffer->ShowY = (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY - 1) % Console->ActiveBuffer->MaxY; } } - else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) - /* only scroll down if there is room to scroll down into */ - { - if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != - Console->ActiveBuffer->CurrentY) + else if (Console->ActiveBuffer->ShowY != Console->ActiveBuffer->CurrentY) + /* only scroll down if there is room to scroll down into */ + { + if (Console->ActiveBuffer->ShowY % Console->ActiveBuffer->MaxY != + Console->ActiveBuffer->CurrentY) { if (((Console->ActiveBuffer->CurrentY + 1) % Console->ActiveBuffer->MaxY) != (Console->ActiveBuffer->ShowY + Console->ActiveBuffer->MaxY) % @@ -1208,30 +1208,30 @@ { /* walk the input queue looking for a char to backspace */ for (TempInput = (ConsoleInput *) Console->InputEvents.Blink; - TempInput != (ConsoleInput *) &Console->InputEvents + TempInput != (ConsoleInput *) &Console->InputEvents && (KEY_EVENT == TempInput->InputEvent.EventType || ! TempInput->InputEvent.Event.KeyEvent.bKeyDown || '\b' == TempInput->InputEvent.Event.KeyEvent.uChar.AsciiChar); - TempInput = (ConsoleInput *) TempInput->ListEntry.Blink) + TempInput = (ConsoleInput *) TempInput->ListEntry.Blink) { /* NOP */; } /* if we found one, delete it, otherwise, wake the client */ if (TempInput != (ConsoleInput *) &Console->InputEvents) - { - /* delete previous key in queue, maybe echo backspace to screen, and do not place backspace on queue */ - RemoveEntryList(&TempInput->ListEntry); - if (TempInput->Echoed) + { + /* delete previous key in queue, maybe echo backspace to screen, and do not place backspace on queue */ + RemoveEntryList(&TempInput->ListEntry); + if (TempInput->Echoed) { ConioWriteConsole(Console, Console->ActiveBuffer, &KeyEventRecord->InputEvent.Event.KeyEvent.uChar.AsciiChar, 1, TRUE); } HeapFree(Win32CsrApiHeap, 0, TempInput); - RemoveEntryList(&KeyEventRecord->ListEntry); - HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); - Console->WaitingChars -= 2; - } + RemoveEntryList(&KeyEventRecord->ListEntry); + HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); + Console->WaitingChars -= 2; + } else { SetEvent(Console->ActiveEvent); @@ -1395,15 +1395,15 @@ LastVirtualKey = msg->wParam; DPRINT ("csrss: %s %s %s %s %02x %02x '%c' %04x\n", - Down ? "down" : "up ", - (msg->message == WM_CHAR || msg->message == WM_SYSCHAR) ? - "char" : "key ", - ConInRec->Fake ? "fake" : "real", - ConInRec->NotChar ? "notc" : "char", - VirtualScanCode, - VirtualKeyCode, - (AsciiChar >= ' ') ? AsciiChar : '.', - ShiftState); + Down ? "down" : "up ", + (msg->message == WM_CHAR || msg->message == WM_SYSCHAR) ? + "char" : "key ", + ConInRec->Fake ? "fake" : "real", + ConInRec->NotChar ? "notc" : "char", + VirtualScanCode, + VirtualKeyCode, + (AsciiChar >= ' ') ? AsciiChar : '.', + ShiftState); if (! ConInRec->Fake || ! ConInRec->NotChar) { @@ -1590,7 +1590,7 @@ CharSize = (Request->Data.WriteConsoleOutputCharRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); if (Request->Header.u1.s1.TotalLength - < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + < CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR) + (Request->Data.WriteConsoleOutputCharRequest.Length * CharSize)) { DPRINT1("Invalid request size\n"); @@ -1606,16 +1606,16 @@ { if(Request->Data.WriteConsoleOutputCharRequest.Unicode) { - Length = WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, - Request->Data.WriteConsoleOutputCharRequest.Length, + Length = WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, NULL, 0, NULL, NULL); tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length); if (String) { - WideCharToMultiByte(Console->CodePage, 0, - (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, - Request->Data.WriteConsoleOutputCharRequest.Length, + WideCharToMultiByte(Console->CodePage, 0, + (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, + Request->Data.WriteConsoleOutputCharRequest.Length, String, Length, NULL, NULL); } else @@ -1627,7 +1627,7 @@ { String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String; } - + if (String) { Status = ConioLockScreenBuffer(ProcessData, @@ -1781,9 +1781,9 @@ if (Done && !Input->Fake) { - Request->Data.ReadInputRequest.MoreEvents = TRUE; - break; - } + Request->Data.ReadInputRequest.MoreEvents = TRUE; + break; + } RemoveEntryList(&Input->ListEntry); @@ -1794,14 +1794,14 @@ { ConioInputEventToAnsi(Console, &Request->Data.ReadInputRequest.Input); } - Done = TRUE; - } + Done = TRUE; + } if (Input->InputEvent.EventType == KEY_EVENT) { if (0 != (Console->Mode & ENABLE_LINE_INPUT) - && Input->InputEvent.Event.KeyEvent.bKeyDown - && '\r' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) + && Input->InputEvent.Event.KeyEvent.bKeyDown + && '\r' == Input->InputEvent.Event.KeyEvent.uChar.AsciiChar) { Console->WaitingLines--; } @@ -2215,7 +2215,7 @@ if (Console->ActiveBuffer) { Buff->MaxX = Console->ActiveBuffer->MaxX; - Buff->MaxY = Console->ActiveBuffer->MaxY; + Buff->MaxY = Console->ActiveBuffer->MaxY; } if (Buff->MaxX == 0) @@ -2694,15 +2694,15 @@ Xpos++; if (Xpos == Buff->MaxX) - { - Xpos = 0; - Ypos++; - - if (Ypos == Buff->MaxY) + { + Xpos = 0; + Ypos++; + + if (Ypos == Buff->MaxY) { Ypos = 0; } - } + } } *ReadBuffer = 0; @@ -2820,7 +2820,7 @@ if (!Input->Fake) { NumEvents++; - } + } } ConioUnlockConsole(Console); @@ -3045,8 +3045,8 @@ Record->Echoed = FALSE; Record->Fake = FALSE; - //Record->InputEvent = *InputRecord++; - memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); + //Record->InputEvent = *InputRecord++; + memcpy(&Record->InputEvent, &InputRecord[i], sizeof(INPUT_RECORD)); if (KEY_EVENT == Record->InputEvent.EventType) { /* FIXME - convert from unicode to ascii!! */ @@ -3335,7 +3335,7 @@ { STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR szCmdline[MAX_PATH]; + WCHAR szCmdline[MAX_PATH]; HKEY hKey; WCHAR szBuffer[MAX_PATH]; @@ -3345,33 +3345,33 @@ /* FIXME : 1. Make it unicode and ansi compatible with TCHAR - + 2. Return state it is running if a tree try start it - one more screen saver when we already have one + one more screen saver when we already have one screen saver running - + 3. Use GetLongPath or GetPathName so we can use %SystemRoot% in the key that will make it posible for livecd have a preview screen saver install. - + 4. Move the code to winlogon SAS and screen saver must run in the secuar desktop. But current our Winlogon does not working - well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) - add the code here as w3seek recommended + well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) + add the code here as w3seek recomandete */ - result = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_QUERY_VALUE, &hKey); if (result == ERROR_SUCCESS) { result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) + if(result == ERROR_SUCCESS) { swprintf(szCmdline, L"%s /s",szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + DPRINT("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); ZeroMemory( &si, sizeof(si) ); si.cb = sizeof(si); ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); @@ -3379,27 +3379,27 @@ } else { - GetSystemDirectoryW(szCmdline,MAX_PATH); - wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + GetSystemDirectoryW(szCmdline,MAX_PATH); + wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); + DPRINT("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); ZeroMemory( &si, sizeof(si) ); si.cb = sizeof(si); ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); } - else - { - DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); - } + else + { + DPRINT("CsrStartScreenSaver : failed 0x%08X\n", result); + } } RegCloseKey(hKey); } else { - DPRINT1("CsrStartScreenSaver : failed to RegOpenKeyExW 0x%08X\n", result); + DPRINT1("CsrStartScreenSaver : failed to RegOpenKeyExW (error 0x%lx)\n", result); } return Request->Status = STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Sun Jul 16 21:00:39 2006 @@ -167,7 +167,7 @@ UINT ScreenSaverTimeOut = 0; BOOL nPreviousState = FALSE; NTSTATUS Status; - BOOL FristTime = TRUE; + BOOL FirstTime = TRUE; KeSetPriorityThread(&PsGetCurrentThread()->Tcb, @@ -217,13 +217,13 @@ (nPreviousState == FALSE)) { BOOL nPreviousState = FALSE; - DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); - DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); - DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); - - if (FristTime == FALSE) - { + DPRINT("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); + DPRINT(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); + + if (FirstTime == FALSE) + { CSR_API_MESSAGE Request; CsrInit(); Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); @@ -231,11 +231,11 @@ co_CsrNotifyScreenSaver(&Request ); IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); - } - else - { - FristTime = FALSE; - } + } + else + { + FirstTime = FALSE; + } } if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) &&

18 years, 2 months

[gedmurphy] 23083: {AUDIT] rossym ROS specific lib

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Jul 16 19:32:42 2006 New Revision: 23083 URL: http://svn.reactos.org/svn/reactos?rev=23083&view=rev Log: {AUDIT] rossym ROS specific lib Modified: trunk/reactos/lib/rossym/delete.c (props changed) trunk/reactos/lib/rossym/find.c (props changed) trunk/reactos/lib/rossym/fromfile.c (props changed) trunk/reactos/lib/rossym/frommem.c (props changed) trunk/reactos/lib/rossym/fromraw.c (props changed) trunk/reactos/lib/rossym/getraw.c (props changed) trunk/reactos/lib/rossym/init.c (props changed) trunk/reactos/lib/rossym/initkm.c (props changed) trunk/reactos/lib/rossym/initum.c (props changed) trunk/reactos/lib/rossym/rossympriv.h (props changed) trunk/reactos/lib/rossym/zwfile.c (props changed) Propchange: trunk/reactos/lib/rossym/delete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/find.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/fromfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/frommem.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/fromraw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/getraw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/initkm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/initum.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/rossympriv.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/rossym/zwfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 2 months

[janderwald] 23082: * check return value of RtlDeleteAtomFromAtomTable * simply, optimize, bugfix UserRegisterClass * allow de-registration for system classes * set ERROR_CLASS_DOES_NOT_EXIST in case of errors * reduces user32_winetest.exe class errors to 31 failures

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jul 16 19:16:55 2006 New Revision: 23082 URL: http://svn.reactos.org/svn/reactos?rev=23082&view=rev Log: * check return value of RtlDeleteAtomFromAtomTable * simply, optimize, bugfix UserRegisterClass * allow de-registration for system classes * set ERROR_CLASS_DOES_NOT_EXIST in case of errors * reduces user32_winetest.exe class errors to 31 failures Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sun Jul 16 19:16:55 2006 @@ -171,11 +171,11 @@ return TRUE; } -static VOID +static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom) { - RtlDeleteAtomFromAtomTable(gAtomTable, - Atom); + return RtlDeleteAtomFromAtomTable(gAtomTable, + Atom); } static BOOL @@ -1147,38 +1147,28 @@ /* try to find a previously registered class */ ClassAtom = IntGetClassAtom(ClassName, - NULL, - NULL, - NULL, + lpwcx->hInstance, + pi, + &Class, NULL); if (ClassAtom != (RTL_ATOM)0) { - Class = IntFindClass(ClassAtom, - lpwcx->hInstance, - &pi->LocalClassList, - NULL); - if (Class != NULL) - { - goto ClassAlreadyExists; - } - - /* if CS_GLOBALCLASS is set, try to find a previously registered global class. - Re-registering system classes as global classes seems to be allowed, - so we don't fail */ if (lpwcx->style & CS_GLOBALCLASS) { - Class = IntFindClass(ClassAtom, - NULL, - ((dwFlags & REGISTERCLASS_SYSTEM) ? - &pi->SystemClassList : &pi->GlobalClassList), - NULL); - if (Class != NULL) - { -ClassAlreadyExists: + // global classes shall not have same names as system classes + if (Class->Global || Class->System) + { DPRINT("Class 0x%p does already exist!\n", ClassAtom); SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); return (RTL_ATOM)0; } + } + else if ( !Class->Global && !Class->System) + { + // local class already exists + DPRINT("Class 0x%p does already exist!\n", ClassAtom); + SetLastWin32Error(ERROR_CLASS_ALREADY_EXISTS); + return (RTL_ATOM)0; } } @@ -1244,13 +1234,6 @@ ASSERT(Class != NULL); - if (Class->System) - { - DPRINT1("Attempted to unregister system class 0x%p!\n", ClassAtom); - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - if (Class->Windows != 0 || Class->Clone != NULL) { @@ -1264,11 +1247,13 @@ /* unlink the class */ *Link = Class->Next; - IntDeregisterClassAtom(Class->Atom); - - /* finally free the resources */ - IntDestroyClass(Class); - return TRUE; + if (NT_SUCCESS(IntDeregisterClassAtom(Class->Atom))) + { + /* finally free the resources */ + IntDestroyClass(Class); + return TRUE; + } + return FALSE; } INT @@ -2117,7 +2102,6 @@ { goto Cleanup; } - _SEH_TRY { /* probe the paramters */ @@ -2184,20 +2168,24 @@ if (!(Class->Global || Class->System) && hInstance == NULL) { + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); Ret = FALSE; } } - } + } + else + { + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); + } } _SEH_HANDLE { - SetLastNtError(_SEH_GetExceptionCode()); + SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); } _SEH_END; Cleanup: UserLeave(); - return Ret; }

18 years, 2 months

[janderwald] 23081: * GetClassInfo should return NULL for hInst when hInst is UserHInstance * fixes one bug found by user32_winetest.exe class.c

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jul 16 18:57:34 2006 New Revision: 23081 URL: http://svn.reactos.org/svn/reactos?rev=23081&view=rev Log: * GetClassInfo should return NULL for hInst when hInst is UserHInstance * fixes one bug found by user32_winetest.exe class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c (original) +++ trunk/reactos/dll/win32/user32/windows/class.c Sun Jul 16 18:57:34 2006 @@ -128,6 +128,11 @@ return FALSE; } + if ( hInstance == User32Instance ) + { + hInstance = NULL; + } + w.cbSize = sizeof(w); retval = GetClassInfoExA(hInstance,lpClassName,&w); if (retval) @@ -154,6 +159,11 @@ { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; + } + + if ( hInstance == User32Instance ) + { + hInstance = NULL; } w.cbSize = sizeof(w);

18 years, 2 months

[greatlrd] 23080: Framebuf drv Implement : DdCanCreateSurface Stub : DdCreateSurface adding struct ddpfDisplay and dxHalInfo ddpfDisplay are being filld but not use dxHalInfo are not fill it is rater large work getting it right

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 16 18:54:59 2006 New Revision: 23080 URL: http://svn.reactos.org/svn/reactos?rev=23080&view=rev Log: Framebuf drv Implement : DdCanCreateSurface Stub : DdCreateSurface adding struct ddpfDisplay and dxHalInfo ddpfDisplay are being filld but not use dxHalInfo are not fill it is rater large work getting it right Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c trunk/reactos/drivers/video/displays/framebuf/ddenable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h Modified: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Sun Jul 16 18:54:59 2006 @@ -22,3 +22,55 @@ #include "framebuf.h" + +DWORD CALLBACK +DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd) +{ + + /* We do not support 3d buffer so we fail here */ + if ((pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && + (pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + return DDHAL_DRIVER_HANDLED; + } + + + /* Check if another pixel format or not, we fail for now */ + if (pccsd->bIsDifferentPixelFormat) + { + /* check the fourcc diffent FOURCC, but we only support BMP for now */ + //if(pccsd->lpDDSurfaceDesc->ddpfPixelFormat.dwFlags & DDPF_FOURCC) + //{ + // /* We do not support other pixel format */ + // switch (pccsd->lpDDSurfaceDesc->ddpfPixelFormat.dwFourCC) + // { + // default: + // pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + // return DDHAL_DRIVER_HANDLED; + // } + //} + // /* check the texture support, we do not support testure for now */ + //else if((pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + //{ + // /* We do not support texture surface */ + // pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + // return DDHAL_DRIVER_HANDLED; + //} + + /* Fail */ + pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + return DDHAL_DRIVER_HANDLED; + } + + pccsd->ddRVal = DD_OK; + return DDHAL_DRIVER_HANDLED; +} + +DWORD CALLBACK +DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface) +{ + lpCreateSurface->ddRVal = DDERR_GENERIC; + return DDHAL_DRIVER_NOTHANDLED; +} + Modified: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Sun Jul 16 18:54:59 2006 @@ -37,33 +37,94 @@ OUT DD_PALETTECALLBACKS *pPaletteCallBacks) { PPDEV ppdev = (PPDEV)dhpdev; - + if (ppdev->bDDInitialized == TRUE) { return TRUE; } + /* Setup pixel format */ + ppdev->ddpfDisplay.dwSize = sizeof( DDPIXELFORMAT ); + ppdev->ddpfDisplay.dwFourCC = 0; + + ppdev->ddpfDisplay.dwRBitMask = ppdev->RedMask; + ppdev->ddpfDisplay.dwGBitMask = ppdev->GreenMask; + ppdev->ddpfDisplay.dwBBitMask = ppdev->BlueMask; + + switch(ppdev->BitsPerPixel) + { + case BMF_8BPP: + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + ppdev->ddpfDisplay.dwRGBBitCount=8; + ppdev->ddpfDisplay.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + break; + + case BMF_16BPP: + ppdev->ddpfDisplay.dwRGBBitCount=16; + switch(ppdev->RedMask) + { + case 0x7C00: + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0x8000; + break; + + default: + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + } + break; + + case BMF_24BPP: + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; + ppdev->ddpfDisplay.dwRGBBitCount=24; + break; + + case BMF_32BPP: + ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; + ppdev->ddpfDisplay.dwRGBBitCount=32; + break; + default: + /* FIXME unknown pixelformat */ + break; + } + + + //InitDDHAL(ppdev); + + if (pCallBacks !=NULL) { memset(pCallBacks,0,sizeof(DD_CALLBACKS)); - /* FILL pCallBacks with hal stuff */ + /* FILL pCallBacks with hal stuff */ + pCallBacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + pCallBacks->CanCreateSurface = (PDD_CANCREATESURFACE)DdCanCreateSurface; + pCallBacks->CreateSurface = (PDD_CREATESURFACE)DdCreateSurface; + + /* Fill in the HAL Callback flags */ + pCallBacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE; } if (pSurfaceCallBacks !=NULL) { memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); - /* FILL pSurfaceCallBacks with hal stuff */ + /* FILL pSurfaceCallBacks with hal stuff */ + // pSurfaceCallBacks.dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + // pSurfaceCallBacks.DestroySurface = DdDestroySurface; + // pSurfaceCallBacks.Lock = DdLock; + // pSurfaceCallBacks.Blt = DdBlt; + + // pSurfaceCallBacks->dwFlags = DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_BLT ; } if (pPaletteCallBacks !=NULL) { memset(pPaletteCallBacks,0,sizeof(DD_PALETTECALLBACKS)); - /* FILL pPaletteCallBacks with hal stuff */ + /* We will not support this callback in the framebuf.dll */ } + + /* Fixme fill the ppdev->dxHalInfo with the info we need */ ppdev->bDDInitialized = TRUE; return ppdev->bDDInitialized; } Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Sun Jul 16 18:54:59 2006 @@ -64,12 +64,20 @@ /* DirectX Support */ BOOL bDDInitialized; + DDPIXELFORMAT ddpfDisplay; + DDHALINFO dxHalInfo; } PDEV, *PPDEV; #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define DEVICE_NAME L"framebuf" #define ALLOC_TAG TAG('F','B','U','F') + +DWORD CALLBACK +DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); + +DWORD CALLBACK +DdCreateSurface(PDD_CREATESURFACEDATA lpCreateSurface); VOID STDCALL DrvDisableDirectDraw(

18 years, 2 months

[gedmurphy] 23079: add Wine cabinet regression tests

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Jul 16 18:24:37 2006 New Revision: 23079 URL: http://svn.reactos.org/svn/reactos?rev=23079&view=rev Log: add Wine cabinet regression tests Added: trunk/reactos/regtests/winetests/cabinet/cabinet.rbuild trunk/reactos/regtests/winetests/cabinet/extract.c trunk/reactos/regtests/winetests/cabinet/testlist.c Modified: trunk/reactos/regtests/winetests/directory.rbuild Added: trunk/reactos/regtests/winetests/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/cabinet… ============================================================================== --- trunk/reactos/regtests/winetests/cabinet/cabinet.rbuild (added) +++ trunk/reactos/regtests/winetests/cabinet/cabinet.rbuild Sun Jul 16 18:24:37 2006 @@ -1,0 +1,8 @@ +<module name="cabinet_winetest" type="win32cui" installbase="bin" installname="cabinet_winetest.exe" allowwarnings="true"> + <include base="cabinet_winetest">.</include> + <define name="__USE_W32API" /> + <library>cabinet</library> + <library>ntdll</library> + <file>extract.c</file> + <file>testlist.c</file> +</module> Added: trunk/reactos/regtests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/cabinet… ============================================================================== --- trunk/reactos/regtests/winetests/cabinet/extract.c (added) +++ trunk/reactos/regtests/winetests/cabinet/extract.c Sun Jul 16 18:24:37 2006 @@ -1,0 +1,388 @@ +/* + * Unit tests for cabinet.dll extract functions + * + * Copyright (C) 2006 James Hawkins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <windows.h> +#include <fci.h> +#include "wine/test.h" + +/* make the max size large so there is only one cab file */ +#define MEDIA_SIZE 999999999 +#define FOLDER_THRESHOLD 900000 + +/* The following defintions were copied from dlls/cabinet/cabinet.h + * because they are undocumented in windows. + */ + +/* EXTRACTdest flags */ +#define EXTRACT_FILLFILELIST 0x00000001 +#define EXTRACT_EXTRACTFILES 0x00000002 + +struct ExtractFileList { + LPSTR filename; + struct ExtractFileList *next; + BOOL unknown; /* always 1L */ +}; + +/* the first parameter of the function extract */ +typedef struct { + long result1; /* 0x000 */ + long unknown1[3]; /* 0x004 */ + struct ExtractFileList *filelist; /* 0x010 */ + long filecount; /* 0x014 */ + long flags; /* 0x018 */ + char directory[0x104]; /* 0x01c */ + char lastfile[0x20c]; /* 0x120 */ +} EXTRACTDEST; + +/* function pointers */ +HMODULE hCabinet; +static HRESULT (WINAPI *pExtract)(EXTRACTDEST*, LPCSTR); + +CHAR CURR_DIR[MAX_PATH]; + +static void init_function_pointers(void) +{ + hCabinet = LoadLibraryA("cabinet.dll"); + + if (hCabinet) + { + pExtract = (void *)GetProcAddress(hCabinet, "Extract"); + } +} + +/* creates a file with the specified name for tests */ +static void createTestFile(const CHAR *name) +{ + HANDLE file; + DWORD written; + + file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); + WriteFile(file, name, strlen(name), &written, NULL); + WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); +} + +static void create_test_files(void) +{ + int len; + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + len = lstrlenA(CURR_DIR); + + if(len && (CURR_DIR[len-1] == '\\')) + CURR_DIR[len-1] = 0; + + createTestFile("a.txt"); + createTestFile("b.txt"); + CreateDirectoryA("testdir", NULL); + createTestFile("testdir\\c.txt"); + createTestFile("testdir\\d.txt"); + CreateDirectoryA("dest", NULL); +} + +static void delete_test_files(void) +{ + DeleteFileA("a.txt"); + DeleteFileA("b.txt"); + DeleteFileA("testdir\\c.txt"); + DeleteFileA("testdir\\d.txt"); + RemoveDirectoryA("testdir"); + + DeleteFileA("extract.cab"); +} + +/* the FCI callbacks */ + +static void *mem_alloc(ULONG cb) +{ + return HeapAlloc(GetProcessHeap(), 0, cb); +} + +static void mem_free(void *memory) +{ + HeapFree(GetProcessHeap(), 0, memory); +} + +static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +{ + return TRUE; +} + +static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +{ + return 0; +} + +static int file_placed(PCCAB pccab, char *pszFile, long cbFile, + BOOL fContinuation, void *pv) +{ + return 0; +} + +static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +{ + HANDLE handle; + DWORD dwAccess = 0; + DWORD dwShareMode = 0; + DWORD dwCreateDisposition = OPEN_EXISTING; + + dwAccess = GENERIC_READ | GENERIC_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + + if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) + dwCreateDisposition = OPEN_EXISTING; + else + dwCreateDisposition = CREATE_NEW; + + handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); + + ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); + + return (INT_PTR)handle; +} + +static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD dwRead; + BOOL res; + + res = ReadFile(handle, memory, cb, &dwRead, NULL); + ok(res, "Failed to ReadFile\n"); + + return dwRead; +} + +static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD dwWritten; + BOOL res; + + res = WriteFile(handle, memory, cb, &dwWritten, NULL); + ok(res, "Failed to WriteFile\n"); + + return dwWritten; +} + +static int fci_close(INT_PTR hf, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + ok(CloseHandle(handle), "Failed to CloseHandle\n"); + + return 0; +} + +static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD ret; + + ret = SetFilePointer(handle, dist, NULL, seektype); + ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); + + return ret; +} + +static int fci_delete(char *pszFile, int *err, void *pv) +{ + BOOL ret = DeleteFileA(pszFile); + ok(ret, "Failed to DeleteFile %s\n", pszFile); + + return 0; +} + +static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +{ + LPSTR tempname; + + tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + GetTempFileNameA(".", "xx", 0, tempname); + + if (tempname && (strlen(tempname) < (unsigned)cbTempName)) + { + lstrcpyA(pszTempName, tempname); + HeapFree(GetProcessHeap(), 0, tempname); + return TRUE; + } + + HeapFree(GetProcessHeap(), 0, tempname); + + return FALSE; +} + +static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) +{ + BY_HANDLE_FILE_INFORMATION finfo; + FILETIME filetime; + HANDLE handle; + DWORD attrs; + BOOL res; + + handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); + + res = GetFileInformationByHandle(handle, &finfo); + ok(res, "Expected GetFileInformationByHandle to succeed\n"); + + FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); + FileTimeToDosDateTime(&filetime, pdate, ptime); + + attrs = GetFileAttributes(pszName); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); + + return (INT_PTR)handle; +} + +static void add_file(HFCI hfci, char *file) +{ + char path[MAX_PATH]; + BOOL res; + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, file); + + res = FCIAddFile(hfci, path, file, FALSE, get_next_cabinet, progress, + get_open_info, tcompTYPE_MSZIP); + ok(res, "Expected FCIAddFile to succeed\n"); +} + +static void set_cab_parameters(PCCAB pCabParams) +{ + ZeroMemory(pCabParams, sizeof(CCAB)); + + pCabParams->cb = MEDIA_SIZE; + pCabParams->cbFolderThresh = FOLDER_THRESHOLD; + pCabParams->setID = 0xbeef; + lstrcpyA(pCabParams->szCabPath, CURR_DIR); + lstrcatA(pCabParams->szCabPath, "\\"); + lstrcpyA(pCabParams->szCab, "extract.cab"); +} + +static void create_cab_file(void) +{ + CCAB cabParams; + HFCI hfci; + ERF erf; + BOOL res; + + set_cab_parameters(&cabParams); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, fci_delete, + get_temp_file, &cabParams, NULL); + + ok(hfci != NULL, "Failed to create an FCI context\n"); + + add_file(hfci, "a.txt"); + add_file(hfci, "b.txt"); + add_file(hfci, "testdir\\c.txt"); + add_file(hfci, "testdir\\d.txt"); + + res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(res, "Failed to flush the cabinet\n"); + + res = FCIDestroy(hfci); + ok(res, "Failed to destroy the cabinet\n"); +} + +static void test_Extract(void) +{ + EXTRACTDEST extractDest; + HRESULT res; + + /* native windows crashes if + * - invalid parameters are sent in + * - you call EXTRACT_EXTRACTFILES without calling + * EXTRACT_FILLFILELIST first or at the same time + */ + + /* try to extract all files */ + ZeroMemory(&extractDest, sizeof(EXTRACTDEST)); + lstrcpyA(extractDest.directory, "dest"); + extractDest.flags = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + + /* try fill file list operation */ + ZeroMemory(&extractDest, sizeof(EXTRACTDEST)); + lstrcpyA(extractDest.directory, "dest"); + extractDest.flags = EXTRACT_FILLFILELIST; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(extractDest.filecount == 4, "Expected 4 files, got %ld\n", extractDest.filecount); + ok(!lstrcmpA(extractDest.lastfile, "dest\\testdir\\d.txt"), + "Expected last file to be dest\\testdir\\d.txt, got %s\n", extractDest.lastfile); + + /* try extract files operation once file list is filled */ + extractDest.flags = EXTRACT_EXTRACTFILES; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest"), "Expected dest to exist\n"); + + /* Extract does not extract files if the dest dir does not exist */ + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + + /* remove two of the files in the list */ + extractDest.filelist->next = extractDest.filelist->next->next; + extractDest.filelist->next->next = NULL; + CreateDirectoryA("dest", NULL); + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + ok(RemoveDirectoryA("dest"), "Expected dest\\testdir to exist\n"); +} + +START_TEST(extract) +{ + init_function_pointers(); + create_test_files(); + create_cab_file(); + + test_Extract(); + + delete_test_files(); +} Added: trunk/reactos/regtests/winetests/cabinet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/cabinet… ============================================================================== --- trunk/reactos/regtests/winetests/cabinet/testlist.c (added) +++ trunk/reactos/regtests/winetests/cabinet/testlist.c Sun Jul 16 18:24:37 2006 @@ -1,0 +1,13 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_extract(void); + +const struct test winetest_testlist[] = +{ + { "extract", func_extract }, + { 0, 0 } +}; Modified: trunk/reactos/regtests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/directo… ============================================================================== --- trunk/reactos/regtests/winetests/directory.rbuild (original) +++ trunk/reactos/regtests/winetests/directory.rbuild Sun Jul 16 18:24:37 2006 @@ -1,6 +1,9 @@ <group> <directory name="advapi32"> <xi:include href="advapi32/advapi32.rbuild" /> +</directory> +<directory name="cabinet"> + <xi:include href="cabinet/cabinet.rbuild" /> </directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.rbuild" />

18 years, 2 months

← Newer
1
...
29
30
31
32
33
34
35
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006