Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[gvg] 15530: Sync to Wine-20050524:

by gvg＠svn.reactos.com

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Gerold Jens Wucherpfennig <gjwucherpfennig(a)gmx.net> - Initial FCI work (FCICreate and FCIDestroy). Modified: trunk/reactos/lib/cabinet/Makefile.in Modified: trunk/reactos/lib/cabinet/cabinet.h Modified: trunk/reactos/lib/cabinet/fci.c _____ Modified: trunk/reactos/lib/cabinet/Makefile.in --- trunk/reactos/lib/cabinet/Makefile.in 2005-05-26 20:07:10 UTC (rev 15529) +++ trunk/reactos/lib/cabinet/Makefile.in 2005-05-26 20:39:17 UTC (rev 15530) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cabinet.dll +IMPORTLIB = libcabinet.$(IMPLIBEXT) IMPORTS = kernel32 C_SRCS = \ _____ Modified: trunk/reactos/lib/cabinet/cabinet.h --- trunk/reactos/lib/cabinet/cabinet.h 2005-05-26 20:07:10 UTC (rev 15529) +++ trunk/reactos/lib/cabinet/cabinet.h 2005-05-26 20:39:17 UTC (rev 15530) @@ -2,6 +2,7 @@ * cabinet.h * * Copyright 2002 Greg Turner + * Copyright 2005 Gerold Jens Wucherpfennig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -292,6 +293,19 @@ typedef struct { unsigned int FCI_Intmagic; + PERF perf; + PFNFCIFILEPLACED pfnfiledest; + PFNFCIALLOC pfnalloc; + PFNFCIFREE pfnfree; + PFNFCIOPEN pfnopen; + PFNFCIREAD pfnread; + PFNFCIWRITE pfnwrite; + PFNFCICLOSE pfnclose; + PFNFCISEEK pfnseek; + PFNFCIDELETE pfndelete; + PFNFCIGETTEMPFILE pfnfcigtf; + PCCAB pccab; + void *pv; } FCI_Int, *PFCI_Int; typedef struct { @@ -307,7 +321,7 @@ } FDI_Int, *PFDI_Int; /* cast an HFCI into a PFCI_Int */ -#define PFCI_INT(hfci) ((PFDI_Int)(hfci)) +#define PFCI_INT(hfci) ((PFCI_Int)(hfci)) /* cast an HFDI into a PFDI_Int */ #define PFDI_INT(hfdi) ((PFDI_Int)(hfdi)) _____ Modified: trunk/reactos/lib/cabinet/fci.c --- trunk/reactos/lib/cabinet/fci.c 2005-05-26 20:07:10 UTC (rev 15529) +++ trunk/reactos/lib/cabinet/fci.c 2005-05-26 20:39:17 UTC (rev 15530) @@ -2,6 +2,7 @@ * File Compression Interface * * Copyright 2002 Patrik Stridvall + * Copyright 2005 Gerold Jens Wucherpfennig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "fci.h" +#include "cabinet.h" #include "wine/debug.h" @@ -33,12 +35,55 @@ /*********************************************************************** * FCICreate (CABINET.10) + * + * Provided with several callbacks, + * returns a handle which can be used to perform operations + * on cabinet files. + * + * PARAMS + * perf [IO] A pointer to an ERF structure. When FCICreate + * returns an error condition, error information may + * be found here as well as from GetLastError. + * pfnfiledest [I] A pointer to a function which is called when a file + * is placed. Only useful for subsequent cabinet files. + * pfnalloc [I] A pointer to a function which allocates ram. Uses + * the same interface as malloc. + * pfnfree [I] A pointer to a function which frees ram. Uses the + * same interface as free. + * pfnopen [I] A pointer to a function which opens a file. Uses + * the same interface as _open. + * pfnread [I] A pointer to a function which reads from a file into + * a caller-provided buffer. Uses the same interface + * as _read + * pfnwrite [I] A pointer to a function which writes to a file from + * a caller-provided buffer. Uses the same interface + * as _write. + * pfnclose [I] A pointer to a function which closes a file handle. + * Uses the same interface as _close. + * pfnseek [I] A pointer to a function which seeks in a file. + * Uses the same interface as _lseek. + * pfndelete [I] A pointer to a function which deletes a file. + * pfnfcigtf [I] A pointer to a function which gets the name of a + * temporary file; ignored in wine + * pccab [I] A pointer to an initialized CCAB structure + * pv [I] A pointer to an application-defined notification + * function which will be passed to other FCI functions + * as a parameter. + * + * RETURNS + * On success, returns an FCI handle of type HFCI. + * On failure, the NULL file handle is returned. Error + * info can be retrieved from perf. + * + * INCLUDES + * fci.h + * */ HFCI __cdecl FCICreate( PERF perf, - PFNFCIFILEPLACED pfnfcifp, - PFNFCIALLOC pfna, - PFNFCIFREE pfnf, + PFNFCIFILEPLACED pfnfiledest, + PFNFCIALLOC pfnalloc, + PFNFCIFREE pfnfree, PFNFCIOPEN pfnopen, PFNFCIREAD pfnread, PFNFCIWRITE pfnwrite, @@ -49,17 +94,57 @@ PCCAB pccab, void *pv) { - FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", - perf, pfnfcifp, pfna, pfnf, pfnopen, pfnread, pfnwrite, pfnclose, - pfnseek, pfndelete, pfnfcigtf, pccab, pv); + HFCI rv; + if ((!pfnalloc) || (!pfnfree)) { perf->erfOper = FCIERR_NONE; - perf->erfType = 0; + perf->erfType = ERROR_BAD_ARGUMENTS; perf->fError = TRUE; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_BAD_ARGUMENTS); + return NULL; + } + if (!(rv = (HFCI) (*pfnalloc)(sizeof(FCI_Int)))) { + perf->erfOper = FCIERR_ALLOC_FAIL; + perf->erfType = ERROR_NOT_ENOUGH_MEMORY; + perf->fError = TRUE; + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; + } + + PFCI_INT(rv)->FCI_Intmagic = FCI_INT_MAGIC; + PFCI_INT(rv)->perf = perf; + PFCI_INT(rv)->pfnfiledest = pfnfiledest; + PFCI_INT(rv)->pfnalloc = pfnalloc; + PFCI_INT(rv)->pfnfree = pfnfree; + PFCI_INT(rv)->pfnopen = pfnopen; + PFCI_INT(rv)->pfnread = pfnread; + PFCI_INT(rv)->pfnwrite = pfnwrite; + PFCI_INT(rv)->pfnclose = pfnclose; + PFCI_INT(rv)->pfnseek = pfnseek; + PFCI_INT(rv)->pfndelete = pfndelete; + PFCI_INT(rv)->pfnfcigtf = pfnfcigtf; + PFCI_INT(rv)->pccab = pccab; + PFCI_INT(rv)->pv = pv; + + /* Still mark as incomplete, because of other missing FCI* APIs */ + + PFCI_INT(rv)->FCI_Intmagic = 0; + PFDI_FREE(rv, rv); + FIXME("(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", + perf, pfnfiledest, pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, + pfnseek, pfndelete, pfnfcigtf, pccab, pv); + + perf->erfOper = FCIERR_NONE; + perf->erfType = 0; + perf->fError = TRUE; + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return NULL; + } /*********************************************************************** @@ -116,12 +201,30 @@ /*********************************************************************** * FCIDestroy (CABINET.14) + * + * Frees a handle created by FCICreate. + * Only reason for failure would be an invalid handle. + * + * PARAMS + * hfci [I] The HFCI to free + * + * RETURNS + * TRUE for success + * FALSE for failure */ BOOL __cdecl FCIDestroy(HFCI hfci) { - FIXME("(%p): stub\n", hfci); + if (REALLY_IS_FCI(hfci)) { + PFCI_INT(hfci)->FCI_Intmagic = 0; + PFDI_FREE(hfci, hfci); + /*return TRUE; */ + } else { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - return FALSE; + /* Still mark as incomplete, because of other missing FCI* APIs */ + FIXME("(%p): stub\n", hfci); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; }

19 years, 7 months

[greatlrd] 15529: Fix more bugs in change display. when you press on aply in desk.cpl later on ok you did get change_display fail msg. fix the return code to reboot req. Remove switch statmenet for more that one flags can be send same time. example CDS_TEST + CDS_FULLSCREEN ..... and replace thuse with if statement instead.

by greatlrd＠svn.reactos.com

Fix more bugs in change display. when you press on aply in desk.cpl later on ok you did get change_display fail msg. fix the return code to reboot req. Remove switch statmenet for more that one flags can be send same time. example CDS_TEST + CDS_FULLSCREEN ..... and replace thuse with if statement instead. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-05-26 19:58:58 UTC (rev 15528) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-05-26 20:07:10 UTC (rev 15529) @@ -2494,7 +2494,6 @@ return TRUE; } - LONG FASTCALL IntChangeDisplaySettings( @@ -2529,22 +2528,44 @@ if (Reset && NoReset) return DISP_CHANGE_BADFLAGS; - switch (dwflags) + if (dwflags == 0) { - case 0: /* Dynamically change graphics mode */ - DPRINT1("flag 0 UNIMPLEMENT \n"); - - Ret = DISP_CHANGE_FAILED; - break; + /* Dynamically change graphics mode */ + DPRINT1("flag 0 UNIMPLEMENT \n"); + return DISP_CHANGE_FAILED; + } - case CDS_FULLSCREEN: /* Given mode is temporary */ - DPRINT1("flag CDS_FULLSCREEN UNIMPLEMENT \n"); - Ret = DISP_CHANGE_FAILED; - break; + if ((dwflags & CDS_TEST) == CDS_TEST) + { + /* Test reslution */ + dwflags &= ~CDS_TEST; + DPRINT1("flag CDS_TEST UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } + + if ((dwflags & CDS_FULLSCREEN) == CDS_FULLSCREEN) + { + /* Full Screen */ + dwflags &= ~CDS_FULLSCREEN; + DPRINT1("flag CDS_FULLSCREEN UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } + if ((dwflags & CDS_VIDEOPARAMETERS) == CDS_VIDEOPARAMETERS) + { + dwflags &= ~CDS_VIDEOPARAMETERS; + if (lParam == NULL) Ret=DISP_CHANGE_BADPARAM; + else + { + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); + Ret = DISP_CHANGE_FAILED; + } - case CDS_UPDATEREGISTRY: - { + } + + if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) + { + UNICODE_STRING ObjectName; UNICODE_STRING KernelModeName; WCHAR KernelModeNameBuffer[256]; @@ -2556,8 +2577,11 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE DevInstRegKey; ULONG NewValue; + DPRINT1("set CDS_UPDATEREGISTRY \n"); + + dwflags &= ~CDS_UPDATEREGISTRY; /* Get device name (pDeviceName is "\.\xxx") */ for (LastSlash = pDeviceName->Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) @@ -2565,7 +2589,8 @@ if (pDeviceName->Buffer[LastSlash - 1] == L'\\') break; } - if (LastSlash == 0) return DISP_CHANGE_FAILED; + + if (LastSlash == 0) return DISP_CHANGE_RESTART; ObjectName = *pDeviceName; ObjectName.Length -= LastSlash * sizeof(WCHAR); ObjectName.MaximumLength -= LastSlash * sizeof(WCHAR); @@ -2577,8 +2602,10 @@ /* Open \??\xxx (ex: "\??\DISPLAY1") */ Status = RtlAppendUnicodeToString(&KernelModeName, L"\\??\\"); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; Status = RtlAppendUnicodeStringToString(&KernelModeName, &ObjectName); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; Status = ObReferenceObjectByName( &KernelModeName, @@ -2589,6 +2616,7 @@ KernelMode, NULL, (PVOID*)&DeviceObject); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; /* Get associated driver name (ex: "VBE") */ for (LastSlash = DeviceObject->DriverObject->DriverName.Length / sizeof(WCHAR); LastSlash > 0; LastSlash--) @@ -2596,6 +2624,7 @@ if (DeviceObject->DriverObject->DriverName.Buffer[LastSlash - 1] == L'\\') break; } + if (LastSlash == 0) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } ObjectName = DeviceObject->DriverObject->DriverName; ObjectName.Length -= LastSlash * sizeof(WCHAR); @@ -2609,11 +2638,14 @@ /* Open registry key */ Status = RtlAppendUnicodeToString(&RegistryKey, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\"); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } Status = RtlAppendUnicodeStringToString(&RegistryKey, &ObjectName); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } Status = RtlAppendUnicodeToString(&RegistryKey, L"\\Device0"); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(DeviceObject); return DISP_CHANGE_FAILED; } InitializeObjectAttributes(&ObjectAttributes, &RegistryKey, @@ -2633,7 +2665,7 @@ if (NT_SUCCESS(Status) && DevMode->dmFields & DM_PELSWIDTH) { RtlInitUnicodeString(&RegistryKey, L"DefaultSettings.XResolution"); - NewValue = DevMode->dmPelsWidth; + NewValue = DevMode->dmPelsWidth; Status = ZwSetValueKey(DevInstRegKey, &RegistryKey, 0, REG_DWORD, &NewValue, sizeof(NewValue)); } @@ -2650,29 +2682,11 @@ else /* return DISP_CHANGE_NOTUPDATED when we can save to reg only vaild for NT */ Ret = DISP_CHANGE_NOTUPDATED; - break; + } - - case CDS_TEST: /* Test if the mode could be set */ - DPRINT1("flag CDS_TEST UNIMPLEMENT"); - Ret = DISP_CHANGE_FAILED; - break; - - - case CDS_VIDEOPARAMETERS: - - if (lParam == NULL) return DISP_CHANGE_BADPARAM; - - DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); - Ret = DISP_CHANGE_FAILED; - break; - - - default: - DPRINT1("flag DISP_CHANGE_BADFLAGS\n"); + + if (dwflags != 0) Ret = DISP_CHANGE_BADFLAGS; - break; - } return Ret; }

19 years, 7 months

[navaraf] 15528: Report 16bpp for modes where VBE returns 15bpp.

by navaraf＠svn.reactos.com

Report 16bpp for modes where VBE returns 15bpp. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-05-26 19:57:54 UTC (rev 15527) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-05-26 19:58:58 UTC (rev 15528) @@ -885,6 +885,14 @@ VideoMode->YMillimeter = 0; /* FIXME */ if (VBEMode->BitsPerPixel > 8) { + /* + * Always report 16bpp modes and not 15bpp mode... + */ + if (VBEMode->BitsPerPixel == 15 && VBEMode->NumberOfPlanes == 1) + { + VideoMode->BitsPerPlane = 16; + } + if (DeviceExtension->VbeInfo.Version < 0x300) { VideoMode->NumberRedBits = VBEMode->RedMaskSize;

19 years, 7 months

[navaraf] 15527: - Revert hacks added by GreatLord in revisons 15521 and 15522.

by navaraf＠svn.reactos.com

- Revert hacks added by GreatLord in revisons 15521 and 15522. - Fix mode enumeration code on few places. Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 19:22:45 UTC (rev 15526) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 19:57:54 UTC (rev 15527) @@ -90,17 +90,9 @@ while (ulTemp--) { - /* - FIXME - Do only remove no supporet mode not reste the ModeInfoPtr->Length=0 - if the mode should be betwin 8 - 32 it will not found the rest - of the mode that comes after it. That why 24bits graphic card - fails. and that reason We add 15bpp check here - */ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && - (ModeInfoPtr->BitsPerPlane != 15) && (ModeInfoPtr->BitsPerPlane != 16) && (ModeInfoPtr->BitsPerPlane != 24) && (ModeInfoPtr->BitsPerPlane != 32))) @@ -108,7 +100,6 @@ ModeInfoPtr->Length = 0; } - ModeInfoPtr = (PVIDEO_MODE_INFORMATION) (((PUCHAR)ModeInfoPtr) + Modes.ModeInformationLength); } @@ -167,7 +158,6 @@ ModeInfoPtr = ModeInfo; while (ModeCount-- > 0) { - if (ModeInfoPtr->Length > 0 && pDevMode->dmPelsWidth == ModeInfoPtr->VisScreenWidth && pDevMode->dmPelsHeight == ModeInfoPtr->VisScreenHeight && @@ -179,7 +169,8 @@ break; } - ModeInfoPtr++; + ModeInfoPtr = (PVIDEO_MODE_INFORMATION) + (((PUCHAR)ModeInfoPtr) + ModeInfoSize); } } @@ -392,6 +383,7 @@ { if (ModeInfoPtr->Length == 0) { + ModeInfoPtr = (PVIDEO_MODE_INFORMATION)(((ULONG_PTR)ModeInfoPtr) + ModeInfoSize); continue; }

19 years, 7 months

[hbirr] 15526: Protected the handle table.

by hbirr＠svn.reactos.com

Protected the handle table. Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/include/api.h _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-05-26 19:22:45 UTC (rev 15526) @@ -123,8 +123,10 @@ } Status = CsrReleaseObjectByPointer(ProcessData->HandleTable[h]); + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); ProcessData->HandleTable[h] = 0; - + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } @@ -138,33 +140,36 @@ return STATUS_INVALID_PARAMETER; } + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + for (i = 0; i < ProcessData->HandleTableSize; i++) { if (ProcessData->HandleTable[i] == NULL) { - ProcessData->HandleTable[i] = Object; - *Handle = (HANDLE)(((i + 1) << 2) | 0x3); - InterlockedIncrement( &Object->ReferenceCount ); - return(STATUS_SUCCESS); + break; } } - NewBlock = RtlAllocateHeap(CsrssApiHeap, - HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * - sizeof(HANDLE)); - if (NewBlock == NULL) + if (i >= ProcessData->HandleTableSize) { - return(STATUS_UNSUCCESSFUL); + NewBlock = RtlAllocateHeap(CsrssApiHeap, + HEAP_ZERO_MEMORY, + (ProcessData->HandleTableSize + 64) * sizeof(HANDLE)); + if (NewBlock == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return(STATUS_UNSUCCESSFUL); + } + RtlCopyMemory(NewBlock, + ProcessData->HandleTable, + ProcessData->HandleTableSize * sizeof(HANDLE)); + RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); + ProcessData->HandleTable = (Object_t **)NewBlock; + ProcessData->HandleTableSize += 64; } - RtlCopyMemory(NewBlock, - ProcessData->HandleTable, - ProcessData->HandleTableSize * sizeof(HANDLE)); - RtlFreeHeap( CsrssApiHeap, 0, ProcessData->HandleTable ); - ProcessData->HandleTable = (Object_t **)NewBlock; ProcessData->HandleTable[i] = Object; *Handle = (HANDLE)(((i + 1) << 2) | 0x3); InterlockedIncrement( &Object->ReferenceCount ); - ProcessData->HandleTableSize = ProcessData->HandleTableSize + 64; + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/api/process.c 2005-05-26 19:22:45 UTC (rev 15526) @@ -103,7 +103,8 @@ ProcessData[hash] = pProcessData->next; RtlFreeHeap(CsrssApiHeap, 0, pProcessData); pProcessData = NULL; - } + } + RtlInitializeCriticalSection(&pProcessData->HandleTableLock); } } else @@ -160,6 +161,7 @@ } RtlFreeHeap(CsrssApiHeap, 0, pProcessData->HandleTable); } + RtlDeleteCriticalSection(&pProcessData->HandleTableLock); if (pProcessData->Console) { CsrReleaseObjectByPointer((Object_t *) pProcessData->Console); @@ -254,7 +256,6 @@ if( !NT_SUCCESS( Status ) ) { DbgPrint( "CSR: NtDuplicateObject() failed: %x\n", Status ); - InterlockedDecrement( &(NewProcessData->Console->Header.ReferenceCount) ); CsrFreeProcessData( NewProcessData->ProcessId ); Reply->Status = Status; return Status; _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-05-26 17:17:29 UTC (rev 15525) +++ trunk/reactos/subsys/csrss/include/api.h 2005-05-26 19:22:45 UTC (rev 15526) @@ -34,6 +34,7 @@ typedef struct _CSRSS_PROCESS_DATA { PCSRSS_CONSOLE Console; + RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; Object_t ** HandleTable; HANDLE ProcessId;

19 years, 7 months

[sedwards] 15525: work around include_next problem when cross-compiling

by sedwards＠svn.reactos.com

work around include_next problem when cross-compiling Modified: trunk/reactos/tools/winebuild/import.c _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-05-26 15:53:24 UTC (rev 15524) +++ trunk/reactos/tools/winebuild/import.c 2005-05-26 17:17:29 UTC (rev 15525) @@ -34,9 +34,15 @@ #endif #include "winglue.h" -#include "wine/exception.h" +//#include "wine/exception.h" #include "build.h" +#ifndef EXCEPTION_NONCONTINUABLE +#define EXCEPTION_NONCONTINUABLE 1 +#endif + +#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ + struct import { DLLSPEC *spec; /* description of the imported dll */

19 years, 7 months

[greatlrd] 15524: change line 15 from #if DBG to #ifdef DBG

by greatlrd＠svn.reactos.com

change line 15 from #if DBG to #ifdef DBG so head builds agein Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-05-26 15:44:04 UTC (rev 15523) +++ trunk/reactos/include/wine/debug.h 2005-05-26 15:53:24 UTC (rev 15524) @@ -12,7 +12,7 @@ unsigned long DbgPrint(char *Format,...); -#if DBG +#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint #else #define DPRINT1(args...)

19 years, 7 months

[hpoussin] 15523: Fix compile when DBG is set

by hpoussin＠svn.reactos.com

Fix compile when DBG is set Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-26 15:15:55 UTC (rev 15522) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2005-05-26 15:44:04 UTC (rev 15523) @@ -32,7 +32,7 @@ #include <ddk/ntapi.h> #ifdef DBG -#define DPRINT(arg) DbgPrint arg; +#define DPRINT(arg) DbgPrint(arg) #else #define DPRINT(arg) #endif

19 years, 7 months

[greatlrd] 15522: add a commet why 24bits cards fails

by greatlrd＠svn.reactos.com

add a commet why 24bits cards fails and maby other card will fails in GetAvailableModes Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 14:46:23 UTC (rev 15521) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 15:15:55 UTC (rev 15522) @@ -90,6 +90,13 @@ while (ulTemp--) { + /* + FIXME + Do only remove no supporet mode not reste the ModeInfoPtr->Length=0 + if the mode should be betwin 8 - 32 it will not found the rest + of the mode that comes after it. That why 24bits graphic card + fails. and that reason We add 15bpp check here + */ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && @@ -101,6 +108,7 @@ ModeInfoPtr->Length = 0; } + ModeInfoPtr = (PVIDEO_MODE_INFORMATION) (((PUCHAR)ModeInfoPtr) + Modes.ModeInformationLength); }

19 years, 7 months

[greatlrd] 15521: Fix the problem for 24 bits graphic card.

by greatlrd＠svn.reactos.com

Fix the problem for 24 bits graphic card. But it report color deep 15 are supported now. it solv the problem. Thanks WaxDragon Hope filip does like this change. Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c _____ Modified: trunk/reactos/drivers/video/displays/framebuf/screen.c --- trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 13:55:13 UTC (rev 15520) +++ trunk/reactos/drivers/video/displays/framebuf/screen.c 2005-05-26 14:46:23 UTC (rev 15521) @@ -93,6 +93,7 @@ if ((ModeInfoPtr->NumberOfPlanes != 1) || !(ModeInfoPtr->AttributeFlags & VIDEO_MODE_GRAPHICS) || ((ModeInfoPtr->BitsPerPlane != 8) && + (ModeInfoPtr->BitsPerPlane != 15) && (ModeInfoPtr->BitsPerPlane != 16) && (ModeInfoPtr->BitsPerPlane != 24) && (ModeInfoPtr->BitsPerPlane != 32)))

19 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
82
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 May 2005