Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32197: We can now build the ARM kernel (but not link it). We now define _disable and _enable for ARM. We shouldn't define KeRaiseIrqlToSynchLevel for each architecture, since the prototype is portable itself. It was a mistake to guard against x86 only system calls -- the system calls should be the same on all archs, just return STATUS_NOT_IMPLEMENTED if they don't make sense. Undo the guards. We now define KeGetPcr() as portable -- it's PCR itself that is a per-arch define. We
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 23:04:31 2008 New Revision: 32197 URL: http://svn.reactos.org/svn/reactos?rev=32197&view=rev Log: We can now build the ARM kernel (but not link it). We now define _disable and _enable for ARM. We shouldn't define KeRaiseIrqlToSynchLevel for each architecture, since the prototype is portable itself. It was a mistake to guard against x86 only system calls -- the system calls should be the same on all archs, just return STATUS_NOT_IMPLEMENTED if they don't make sense. Undo the guards. We now define KeGetPcr() as portable -- it's PCR itself that is a per-arch define. We now support ARM in RtlWalkFrameChain. We now support ARM in PspCreateThread. We now define KeArchHaltProcessor for ARM by using Wait-For-Interrupt Mode. We now define KeArmInitThreadWithContext for ARM. KiRestore/SaveProcessorControlState are portable prototypes, we now define them as such. Bochs KD code should use the portable WRITE/READ_PORT_UCHAR defines, we now do so. We now support ARM in SharedUserData->ImageNumberLow/High during ExpInitializeExecutive. NtQuerySytemInformation for SystemProcessorInformation has now been fixed to use the portable KeProcesssorXxx variables instead of reading from the non-portable PRCB values. We now support NtFlushInstructionCache for ARM by flushing the I-Cache. Added: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (with props) Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 23:04:31 2008 @@ -9495,12 +9495,6 @@ KeRaiseIrqlToDpcLevel( VOID); -NTHALAPI -KIRQL -DDKAPI -KeRaiseIrqlToSynchLevel( - VOID); - #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) @@ -9587,14 +9581,15 @@ KeRaiseIrqlToDpcLevel( VOID); +#endif + NTKERNELAPI KIRQL DDKAPI KeRaiseIrqlToSynchLevel( VOID); -#endif - + /** Memory manager routines **/ NTKERNELAPI Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Thu Feb 7 23:04:31 2008 @@ -38,6 +38,11 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// No LDTs on ARM +// +#define LDT_ENTRY ULONG // // HAL Variables Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Thu Feb 7 23:04:31 2008 @@ -28,9 +28,8 @@ // #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) #define PCR ((volatile KPCR * const)K0IPCR) -#if !defined(CONFIG_SMP) && !defined(NT_BUILD) -#define KeGetPcr() PCR -#else +#if defined(CONFIG_SMP) || defined(NT_BUILD) +#undef KeGetPcr() #define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) #endif Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Feb 7 23:04:31 2008 @@ -457,7 +457,6 @@ IN KPROFILE_SOURCE ClockSource ); -#ifdef _M_IX86 NTSYSCALLAPI NTSTATUS NTAPI @@ -467,7 +466,6 @@ IN ULONG Selector2, IN LDT_ENTRY LdtEntry2 ); -#endif NTSYSCALLAPI NTSTATUS @@ -665,7 +663,6 @@ IN KPROFILE_SOURCE ClockSource ); -#ifdef _M_IX86 NTSYSAPI NTSTATUS NTAPI @@ -675,7 +672,6 @@ IN ULONG Selector2, IN LDT_ENTRY LdtEntry2 ); -#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Thu Feb 7 23:04:31 2008 @@ -111,6 +111,11 @@ #else #define KINTERRUPT_DISPATCH_CODES 106 #endif + +// +// Get KPCR +// +#define KeGetPcr() PCR #ifdef NTOS_MODE_USER Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Thu Feb 7 23:04:31 2008 @@ -148,5 +148,25 @@ return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } +static __inline__ __attribute__((always_inline)) void _disable(void) +{ + __asm__ __volatile__ + ( + "mrs r1, cpsr;" + "orr r1, r1, #0x80;" + "msr cpsr, r1;" + ); +} + +static __inline__ __attribute__((always_inline)) void _enable(void) +{ + __asm__ __volatile__ + ( + "mrs r1, cpsr;" + "bic r1, r1, #0x80;" + "msr cpsr, r1;" + ); +} + #endif /* EOF */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Feb 7 23:04:31 2008 @@ -4108,6 +4108,7 @@ // // NT-ARM is not documented // +#define KIRQL ULONG // Hack! #include <armddk.h> #else Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 23:04:31 2008 @@ -103,16 +103,12 @@ // // IRQL Support on ARM is similar to MIPS/ALPHA // -NTKERNELAPI KIRQL -DDKAPI KeSwapIrql( IN KIRQL NewIrql ); -NTKERNELAPI KIRQL -NTAPI KeRaiseIrqlToDpcLevel( VOID ); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=321… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 7 23:04:31 2008 @@ -1229,6 +1229,9 @@ #elif defined(_MIPS_) SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000; +#elif defined(_ARM_) + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARM; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARM; #else #error "Unsupported ReactOS Target" #endif Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Feb 7 23:04:31 2008 @@ -531,11 +531,11 @@ return (STATUS_INFO_LENGTH_MISMATCH); } Prcb = KeGetCurrentPrcb(); - Spi->ProcessorArchitecture = 0; /* Intel Processor */ - Spi->ProcessorLevel = Prcb->CpuType; - Spi->ProcessorRevision = Prcb->CpuStep; + Spi->ProcessorArchitecture = KeProcessorArchitecture; + Spi->ProcessorLevel = KeProcessorLevel; + Spi->ProcessorRevision = KeProcessorRevision; Spi->Reserved = 0; - Spi->ProcessorFeatureBits = Prcb->FeatureBits; + Spi->ProcessorFeatureBits = KeFeatureBits; DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, Spi->ProcessorLevel, Spi->ProcessorRevision); @@ -1927,6 +1927,8 @@ #elif defined(_M_MIPS) DPRINT1("NtFlushInstructionCache() is not implemented\n"); for (;;); +#elif defined(_M_ARM) + __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); #else #error Unknown architecture #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Thu Feb 7 23:04:31 2008 @@ -26,9 +26,7 @@ #elif defined(_M_MIPS) #include "../mips/intrin_i.h" #elif defined(_M_ARM) -// -// Not sure we'll need ARM internal intrinsics -// +#include "../arm/intrin_i.h" #else #error "Unknown processor" #endif Added: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Thu Feb 7 23:04:31 2008 @@ -1,0 +1,18 @@ +#ifndef _INTRIN_INTERNAL_ +#define _INTRIN_INTERNAL_ + +static __inline__ __attribute__((always_inline)) void KeArchHaltProcessor(void) +{ + // + // Enter Wait-For-Interrupt Mode + // + __asm__ __volatile__ + ( + "mov r1, #0;" + "mcr p15, 0, r1, c7, c0, 4;" + ); +} + +#endif + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Thu Feb 7 23:04:31 2008 @@ -1,1 +1,20 @@ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H +#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +VOID +NTAPI +KeArmInitThreadWithContext( + IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context +); + +#define KeArchInitThreadWithContext KeArmInitThreadWithContext + +#endif Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Thu Feb 7 23:04:31 2008 @@ -59,18 +59,6 @@ IN PKTSS Tss, IN PKIDTENTRY Idt, IN PKGDTENTRY Gdt -); - -VOID -NTAPI -KiRestoreProcessorControlState( - IN PKPROCESSOR_STATE ProcessorState -); - -VOID -NTAPI -KiSaveProcessorControlState( - OUT PKPROCESSOR_STATE ProcessorState ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Feb 7 23:04:31 2008 @@ -972,6 +972,18 @@ IN OUT PKSPIN_LOCK_QUEUE LockQueue ); +VOID +NTAPI +KiRestoreProcessorControlState( + IN PKPROCESSOR_STATE ProcessorState +); + +VOID +NTAPI +KiSaveProcessorControlState( + OUT PKPROCESSOR_STATE ProcessorState +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Thu Feb 7 23:04:31 2008 @@ -12,7 +12,7 @@ #include <internal/debug.h> /* bochs debug output */ -#define BOCHS_LOGGER_PORT (0xe9) +#define BOCHS_LOGGER_PORT ((PVOID)0xe9) /* FUNCTIONS *****************************************************************/ @@ -27,9 +27,9 @@ { if (*Message == '\n') { - __outbyte(BOCHS_LOGGER_PORT, '\r'); + WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, '\r'); } - __outbyte(BOCHS_LOGGER_PORT, *Message); + WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, *Message); Message++; } } @@ -44,8 +44,8 @@ if (BootPhase == 0) { - Value = __inbyte(BOCHS_LOGGER_PORT); - if (Value != BOCHS_LOGGER_PORT) + Value = READ_PORT_UCHAR(BOCHS_LOGGER_PORT); + if (Value != (ULONG)BOCHS_LOGGER_PORT) { KdpDebugMode.Bochs = FALSE; return; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 7 23:04:31 2008 @@ -112,7 +112,7 @@ */ MiInitPageDirectoryMap(); - BaseAddress = (PVOID)KIP0PCRADDRESS; + BaseAddress = (PVOID)PCR; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Feb 7 23:04:31 2008 @@ -325,10 +325,14 @@ Thread->StartAddress = (PVOID)ThreadContext->Eip; Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; #elif defined(_M_PPC) - Thread->StartAddress = (PVOID)ThreadContext->Dr0; - Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3; + Thread->StartAddress = (PVOID)ThreadContext->Dr0; + Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3; #elif defined(_M_MIPS) - for (;;); + Thread->StartAddress = (PVOID)ThreadContext->Psr; + Thread->Win32StartAddress = (PVOID)ThreadContext->IntA0; +#elif defined(_M_ARM) + Thread->StartAddress = (PVOID)ThreadContext->Pc; + Thread->Win32StartAddress = (PVOID)ThreadContext->R0; #else #error Unknown architecture #endif Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Feb 7 23:04:31 2008 @@ -284,6 +284,8 @@ __asm__("move $sp, %0" : "=r" (Stack) : ); #elif defined(_M_PPC) __asm__("mr %0,1" : "=r" (Stack) : ); +#elif defined(_M_ARM) + __asm__("mov sp, %0" : "=r"(Stack) : ); #else #error Unknown architecture #endif

1 0

[hpoussin] 32196: Fix for the fix
by hpoussin＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: hpoussin Date: Thu Feb 7 22:58:31 2008 New Revision: 32196 URL: http://svn.reactos.org/svn/reactos?rev=32196&view=rev Log: Fix for the fix Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Feb 7 22:58:31 2008 @@ -1316,7 +1316,6 @@ } Size = sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - *pRequiredSize = Size; DeviceNode->ResourceList = ExAllocatePool(PagedPool, Size); if (!DeviceNode->ResourceList) { @@ -1454,6 +1453,7 @@ DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources; + *pRequiredSize = Size; return STATUS_SUCCESS; ByeBye: @@ -1462,6 +1462,7 @@ ExFreePool(DeviceNode->ResourceList); DeviceNode->ResourceList = NULL; } + *pRequiredSize = 0; return Status; }

1 0

[cfinck] 32194: - Open the Edit windows as modeless dialogs, so the user can edit more than one character at the same time - Simplify the linked-list functions
by cfinck＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: cfinck Date: Thu Feb 7 22:14:55 2008 New Revision: 32194 URL: http://svn.reactos.org/svn/reactos?rev=32194&view=rev Log: - Open the Edit windows as modeless dialogs, so the user can edit more than one character at the same time - Simplify the linked-list functions Modified: trunk/rosapps/devutils/vgafontedit/editglyphdlg.c trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c trunk/rosapps/devutils/vgafontedit/fontwnd.c trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/lang/en-US.rc trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/devutils/vgafontedit/precomp.h trunk/rosapps/devutils/vgafontedit/resource.h Modified: trunk/rosapps/devutils/vgafontedit/editglyphdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/editg… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/editglyphdlg.c (original) +++ trunk/rosapps/devutils/vgafontedit/editglyphdlg.c Thu Feb 7 22:14:55 2008 @@ -90,8 +90,26 @@ // Fall through } + // This is the equivalent of WM_DESTROY for dialogs case IDCANCEL: EndDialog(Info->hSelf, 0); + + // Remove the window from the linked list + if(Info->PrevEditGlyphWnd) + Info->PrevEditGlyphWnd->NextEditGlyphWnd = Info->NextEditGlyphWnd; + else + Info->FontWndInfo->FirstEditGlyphWnd = Info->NextEditGlyphWnd; + + if(Info->NextEditGlyphWnd) + Info->NextEditGlyphWnd->PrevEditGlyphWnd = Info->PrevEditGlyphWnd; + else + Info->FontWndInfo->LastEditGlyphWnd = Info->PrevEditGlyphWnd; + + SetWindowLongW(Info->hSelf, GWLP_USERDATA, 0); + SetWindowLongW(Info->hEdit, GWLP_USERDATA, 0); + SetWindowLongW(Info->hPreview, GWLP_USERDATA, 0 ); + + HeapFree(hProcessHeap, 0, Info); return TRUE; } @@ -111,14 +129,6 @@ { case WM_COMMAND: return EditGlyphCommand( LOWORD(wParam), Info ); - - case WM_DESTROY: - SetWindowLongW(hwnd, GWLP_USERDATA, 0); - SetWindowLongW(Info->hEdit, GWLP_USERDATA, 0); - SetWindowLongW(Info->hPreview, GWLP_USERDATA, 0 ); - - HeapFree(hProcessHeap, 0, Info); - return TRUE; case WM_INITDIALOG: Info = (PEDIT_GLYPH_INFO) lParam; Modified: trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontb… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c Thu Feb 7 22:14:55 2008 @@ -189,12 +189,41 @@ { PEDIT_GLYPH_INFO EditGlyphInfo; + // Has the window for this character already been opened? + EditGlyphInfo = FontWndInfo->FirstEditGlyphWnd; + + while(EditGlyphInfo) + { + if(EditGlyphInfo->uCharacter == FontWndInfo->uSelectedCharacter) + { + // Yes, it has. Bring it to the front. + SetFocus(EditGlyphInfo->hSelf); + return; + } + + EditGlyphInfo = EditGlyphInfo->NextEditGlyphWnd; + } + + // No. Then create a new one EditGlyphInfo = (PEDIT_GLYPH_INFO) HeapAlloc( hProcessHeap, 0, sizeof(EDIT_GLYPH_INFO) ); EditGlyphInfo->FontWndInfo = FontWndInfo; EditGlyphInfo->uCharacter = FontWndInfo->uSelectedCharacter; RtlCopyMemory( EditGlyphInfo->CharacterBits, FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, sizeof(EditGlyphInfo->CharacterBits) ); - DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_EDITGLYPH), FontWndInfo->hSelf, EditGlyphDlgProc, (LPARAM)EditGlyphInfo); + // Add the new window to the linked list + EditGlyphInfo->PrevEditGlyphWnd = FontWndInfo->LastEditGlyphWnd; + EditGlyphInfo->NextEditGlyphWnd = NULL; + + if(FontWndInfo->LastEditGlyphWnd) + FontWndInfo->LastEditGlyphWnd->NextEditGlyphWnd = EditGlyphInfo; + else + FontWndInfo->FirstEditGlyphWnd = EditGlyphInfo; + + FontWndInfo->LastEditGlyphWnd = EditGlyphInfo; + + // Open the window as a modeless dialog, so people can edit several characters at the same time. + EditGlyphInfo->hSelf = CreateDialogParamW(hInstance, MAKEINTRESOURCEW(IDD_EDITGLYPH), FontWndInfo->hSelf, EditGlyphDlgProc, (LPARAM)EditGlyphInfo); + ShowWindow(EditGlyphInfo->hSelf, SW_SHOW); } VOID Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontwnd.c Thu Feb 7 22:14:55 2008 @@ -122,6 +122,19 @@ case WM_USER_APPCLOSE: case WM_CLOSE: + // The user has to close all open edit dialogs first + if(Info->FirstEditGlyphWnd) + { + PWSTR pszMessage; + + AllocAndLoadString(&pszMessage, IDS_CLOSEEDIT); + MessageBoxW(hwnd, pszMessage, szAppName, MB_OK | MB_ICONEXCLAMATION); + HeapFree(hProcessHeap, 0, pszMessage); + + return 0; + } + + // Prompt if the current file has been modified if(Info->OpenInfo->bModified) { INT nMsgBoxResult; @@ -164,25 +177,15 @@ case WM_DESTROY: // Remove the window from the linked list - if(Info->MainWndInfo->FirstFontWnd == Info) - { + if(Info->PrevFontWnd) + Info->PrevFontWnd->NextFontWnd = Info->NextFontWnd; + else Info->MainWndInfo->FirstFontWnd = Info->NextFontWnd; - if(Info->NextFontWnd) - Info->NextFontWnd->PrevFontWnd = NULL; - } - else - Info->PrevFontWnd->NextFontWnd = Info->NextFontWnd; - - if(Info->MainWndInfo->LastFontWnd == Info) - { + if(Info->NextFontWnd) + Info->NextFontWnd->PrevFontWnd = Info->PrevFontWnd; + else Info->MainWndInfo->LastFontWnd = Info->PrevFontWnd; - - if(Info->PrevFontWnd) - Info->PrevFontWnd->NextFontWnd = NULL; - } - else - Info->NextFontWnd->PrevFontWnd = Info->PrevFontWnd; // Free memory if(Info->Font) @@ -394,17 +397,14 @@ if(hFontWnd) { // Add the new window to the linked list + Info->PrevFontWnd = Info->MainWndInfo->LastFontWnd; + if(Info->MainWndInfo->LastFontWnd) - { - Info->PrevFontWnd = Info->MainWndInfo->LastFontWnd; - Info->PrevFontWnd->NextFontWnd = Info; - Info->MainWndInfo->LastFontWnd = Info; - } - else - { + Info->MainWndInfo->LastFontWnd->NextFontWnd = Info; + else Info->MainWndInfo->FirstFontWnd = Info; - Info->MainWndInfo->LastFontWnd = Info; - } + + Info->MainWndInfo->LastFontWnd = Info; return TRUE; } Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Schriftzeichen bearbeiten" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Bitte schließen Sie zuerst alle offenen Bearbeitungs-Fenster!" IDS_TOOLTIP_NEW, "Neu" IDS_TOOLTIP_OPEN, "Öffnen" Modified: trunk/rosapps/devutils/vgafontedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/en-US.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/en-US.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit Glyph" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "The file ""%1"" was modified, but not saved.\n\nDo you want to save it?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "New" IDS_TOOLTIP_OPEN, "Open" Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edycja Glifów" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Czcionka %1!u!" IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Nowy" IDS_TOOLTIP_OPEN, "Otwórz" Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ðåäàêòèðîâàíèå ñèìâîëà" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Íîâûé" IDS_TOOLTIP_OPEN, "Îòêðûòü" Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit Glyph" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Ñòâîðèòè" IDS_TOOLTIP_OPEN, "Â³äêðèòè" Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Thu Feb 7 22:14:55 2008 @@ -29,8 +29,8 @@ IDI_DOC ICON "res/doc.ico" // Languages +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" -#include "lang/uk-UA.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Thu Feb 7 22:14:55 2008 @@ -17,6 +17,7 @@ // Forward declarations typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO; +typedef struct _EDIT_GLYPH_INFO EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO; // Structure declarations typedef struct _BITMAP_FONT @@ -60,9 +61,12 @@ PFONT_WND_INFO PrevFontWnd; PFONT_WND_INFO NextFontWnd; + + PEDIT_GLYPH_INFO FirstEditGlyphWnd; + PEDIT_GLYPH_INFO LastEditGlyphWnd; }; -typedef struct _EDIT_GLYPH_INFO +struct _EDIT_GLYPH_INFO { PFONT_WND_INFO FontWndInfo; @@ -73,7 +77,10 @@ HWND hEdit; HWND hPreview; LONG lEditSpacing; -} EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO; + + PEDIT_GLYPH_INFO PrevEditGlyphWnd; + PEDIT_GLYPH_INFO NextEditGlyphWnd; +}; #define ID_MDI_FIRSTCHILD 50000 Modified: trunk/rosapps/devutils/vgafontedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/resou… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/resource.h (original) +++ trunk/rosapps/devutils/vgafontedit/resource.h Thu Feb 7 22:14:55 2008 @@ -65,6 +65,7 @@ #define IDS_DOCNAME 10008 #define IDS_SAVEPROMPT 10009 #define IDS_APPTITLE 10010 +#define IDS_CLOSEEDIT 10011 #define IDS_TOOLTIP_NEW 11001 #define IDS_TOOLTIP_OPEN 11002

1 0

[fireball] 32193: - Rename vfatfs.sys to fastfat.sys for compatibility reasons.
by fireball＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: fireball Date: Thu Feb 7 21:06:11 2008 New Revision: 32193 URL: http://svn.reactos.org/svn/reactos?rev=32193&view=rev Log: - Rename vfatfs.sys to fastfat.sys for compatibility reasons. Added: trunk/reactos/drivers/filesystems/fastfat/ - copied from r32184, trunk/reactos/drivers/filesystems/vfat/ Removed: trunk/reactos/drivers/filesystems/vfat/ Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/drivers/filesystems/directory.rbuild trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Thu Feb 7 21:06:11 2008 @@ -733,11 +733,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 ; Virtual FAT filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ImagePath",0x00020000,"system32\drivers\vfatfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Thu Feb 7 21:06:11 2008 @@ -32,7 +32,7 @@ pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 -vfatfs.sys=,,,,,,,,,,,,4 +fastfat.sys=,,,,,,,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Thu Feb 7 21:06:11 2008 @@ -400,8 +400,8 @@ return; } - /* Load vfatfs.sys (could be loaded by the setup prog!) */ - if (!LoadDriver(SourcePath, "vfatfs.sys")) + /* Load fastfat.sys (could be loaded by the setup prog!) */ + if (!LoadDriver(SourcePath, "fastfat.sys")) return; /* Load additional files specified in txtsetup.inf */ Modified: trunk/reactos/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/direct… ============================================================================== --- trunk/reactos/drivers/filesystems/directory.rbuild (original) +++ trunk/reactos/drivers/filesystems/directory.rbuild Thu Feb 7 21:06:11 2008 @@ -19,7 +19,7 @@ <directory name="ntfs"> <xi:include href="ntfs/ntfs.rbuild" /> </directory> -<directory name="vfat"> - <xi:include href="vfat/vfatfs.rbuild" /> +<directory name="fastfat"> + <xi:include href="fastfat/vfatfs.rbuild" /> </directory> </group> Modified: trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild Thu Feb 7 21:06:11 2008 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> +<module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <include base="vfatfs">.</include> + <include base="fastfat">.</include> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library>

1 0

[hpoussin] 32192: Fill output variable before returning
by hpoussin＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: hpoussin Date: Thu Feb 7 21:04:03 2008 New Revision: 32192 URL: http://svn.reactos.org/svn/reactos?rev=32192&view=rev Log: Fill output variable before returning Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Feb 7 21:04:03 2008 @@ -1270,6 +1270,7 @@ { /* No resource needed for this device */ DeviceNode->ResourceList = NULL; + *pRequiredSize = 0; return STATUS_SUCCESS; }

1 0

[janderwald] 32191: - fix auto timezone selection for bulgarian locale - patch by CCTAHEB See issue #2887 for more details.
by janderwald＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: janderwald Date: Thu Feb 7 20:52:24 2008 New Revision: 32191 URL: http://svn.reactos.org/svn/reactos?rev=32191&view=rev Log: - fix auto timezone selection for bulgarian locale - patch by CCTAHEB See issue #2887 for more details. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Thu Feb 7 20:52:24 2008 @@ -138,7 +138,7 @@ "41b", "95",\ "81a", "95",\ "c1a", "95",\ - "402", "100",\ + "402", "125",\ "415", "100",\ "1801", "100",\ "41a", "100",\

1 0

[gbrunmar] 32190: * Fixed d3d9 critical section not being unlocked in GetAdapterIdentifier * Implemeted IDirect3D9::GetAdapterMonitor
by gbrunmar＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: gbrunmar Date: Thu Feb 7 20:32:49 2008 New Revision: 32190 URL: http://svn.reactos.org/svn/reactos?rev=32190&view=rev Log: * Fixed d3d9 critical section not being unlocked in GetAdapterIdentifier * Implemeted IDirect3D9::GetAdapterMonitor Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Thu Feb 7 20:32:49 2008 @@ -10,10 +10,19 @@ #include <d3d9.h> #include <ddraw.h> #include <strsafe.h> +#include "adapter.h" typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); typedef BOOL (WINAPI *LPFN_DISABLEWOW64FSREDIRECTION) (PVOID*); typedef BOOL (WINAPI *LPFN_REVERTWOW64FSREDIRECTION) (PVOID); + + +typedef struct _ADAPTERMONITOR +{ + LPCSTR lpszDeviceName; + HMONITOR hMonitor; +} ADAPTERMONITOR, *LPADAPTERMONITOR; + static BOOL GetDriverName(LPDISPLAY_DEVICEA pDisplayDevice, D3DADAPTER_IDENTIFIER9* pIdentifier) { @@ -156,3 +165,33 @@ return TRUE; } + +static BOOL CALLBACK AdapterMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXA MonitorInfoEx; + LPADAPTERMONITOR lpAdapterMonitor = (LPADAPTERMONITOR)dwData; + + memset(&MonitorInfoEx, 0, sizeof(MONITORINFOEXA)); + MonitorInfoEx.cbSize = sizeof(MONITORINFOEXA); + + GetMonitorInfoA(hMonitor, (LPMONITORINFO)&MonitorInfoEx); + + if (_stricmp(lpAdapterMonitor->lpszDeviceName, MonitorInfoEx.szDevice) == 0) + { + lpAdapterMonitor->hMonitor = hMonitor; + return FALSE; + } + + return TRUE; +} + +HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName) +{ + ADAPTERMONITOR AdapterMonitor; + AdapterMonitor.lpszDeviceName = lpszDeviceName; + AdapterMonitor.hMonitor = NULL; + + EnumDisplayMonitors(NULL, NULL, AdapterMonitorEnumProc, (LPARAM)&AdapterMonitor); + + return AdapterMonitor.hMonitor; +} Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Thu Feb 7 20:32:49 2008 @@ -11,4 +11,6 @@ BOOL GetAdapterInfo(LPCSTR lpszDeviceName, D3DADAPTER_IDENTIFIER9* pIdentifier); +HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); + #endif Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Thu Feb 7 20:32:49 2008 @@ -18,6 +18,9 @@ LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) { + if (IsBadWritePtr(iface, sizeof(LPDIRECT3D9_INT))) + return NULL; + return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl)); } Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Thu Feb 7 20:32:49 2008 @@ -69,7 +69,7 @@ * @param LPDIRECT3D iface * Pointer to the IDirect3D object returned from Direct3DCreate9() * -* @return +* @return UINT * The number of display adapters on the system when Direct3DCreate9() was called. * */ @@ -107,7 +107,7 @@ * Pointer to a D3DADAPTER_IDENTIFIER9 structure to be filled with the available information * about the display adapter. * -* @return +* @return HRESULT * If the method successfully fills the pIdentified structure, the return value is D3D_OK. * If Adapter is out of range, Flags is invalid or pIdentifier is a bad pointer, the return value * will be D3DERR_INVALIDCALL. @@ -148,6 +148,7 @@ return D3DERR_INVALIDCALL; } + UNLOCK_D3D9(); return D3D_OK; } @@ -223,11 +224,43 @@ return D3D_OK; } +/*++ +* @name IDirect3D9::GetAdapterMonitor +* @implemented +* +* The function IDirect3D9Impl_GetAdapterMonitor returns the monitor associated +* with the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @return HMONITOR +* If the method successfully it returns the HMONITOR belonging to the specified adapter. +* If the method fails, the return value is NULL. +* +*/ static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) { - UNIMPLEMENTED - - return NULL; + HMONITOR hAdapterMonitor = NULL; + + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter < This->NumDisplayAdapters) + { + hAdapterMonitor = GetAdapterMonitor(This->DisplayAdapters[Adapter].szDeviceName); + } + else + { + DPRINT1("Invalid Adapter number specified"); + } + + UNLOCK_D3D9(); + return hAdapterMonitor; } static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType,

1 0

[cfinck] 32189: Define O_BINARY to 0 in include/wine/port.h if it's not defined. Wine's version of this file already contains this #define. This way we can remove one more difference in our widl version compared to the Wine one.
by cfinck＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: cfinck Date: Thu Feb 7 20:27:25 2008 New Revision: 32189 URL: http://svn.reactos.org/svn/reactos?rev=32189&view=rev Log: Define O_BINARY to 0 in include/wine/port.h if it's not defined. Wine's version of this file already contains this #define. This way we can remove one more difference in our widl version compared to the Wine one. Modified: trunk/reactos/include/reactos/wine/port.h trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h (original) +++ trunk/reactos/include/reactos/wine/port.h Thu Feb 7 20:27:25 2008 @@ -123,6 +123,9 @@ # define O_LARGEFILE 0 #endif +#ifndef O_BINARY +# define O_BINARY 0 +#endif /**************************************************************** * Constants Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Thu Feb 7 20:27:25 2008 @@ -1,6 +1,6 @@ Index: hash.c =================================================================== ---- hash.c (revision 31863) +--- hash.c (revision 32187) +++ hash.c (working copy) @@ -21,9 +21,7 @@ #include <stdio.h> @@ -36,7 +36,7 @@ break; Index: server.c =================================================================== ---- server.c (revision 31863) +--- server.c (revision 32187) +++ server.c (working copy) @@ -390,6 +390,7 @@ print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); @@ -48,7 +48,7 @@ } Index: typelib.c =================================================================== ---- typelib.c (revision 31863) +--- typelib.c (revision 32187) +++ typelib.c (working copy) @@ -35,8 +35,7 @@ #define NONAMELESSUNION @@ -62,7 +62,7 @@ #include "utils.h" Index: utils.c =================================================================== ---- utils.c (revision 31863) +--- utils.c (revision 32187) +++ utils.c (working copy) @@ -136,6 +136,9 @@ name = "widl.tab"; @@ -76,7 +76,7 @@ Index: widl.c =================================================================== ---- widl.c (revision 31863) +--- widl.c (revision 32187) +++ widl.c (working copy) @@ -166,6 +166,9 @@ int i; @@ -90,7 +90,7 @@ token = xstrdup(name); Index: widltypes.h =================================================================== ---- widltypes.h (revision 31863) +--- widltypes.h (revision 32187) +++ widltypes.h (working copy) @@ -21,6 +21,13 @@ #ifndef __WIDL_WIDLTYPES_H @@ -106,21 +106,9 @@ #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" -@@ -34,6 +41,11 @@ - #define TRUE 1 - #define FALSE 0 - -+// All hosts, which don't define O_BINARY, don't need it :-) -+#ifndef O_BINARY -+#define O_BINARY 0 -+#endif -+ - typedef struct _attr_t attr_t; - typedef struct _expr_t expr_t; - typedef struct _type_t type_t; Index: write_msft.c =================================================================== ---- write_msft.c (revision 31863) +--- write_msft.c (revision 32187) +++ write_msft.c (working copy) @@ -40,10 +40,8 @@ #define NONAMELESSUNION Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Thu Feb 7 20:27:25 2008 @@ -40,11 +40,6 @@ #define TRUE 1 #define FALSE 0 - -// All hosts, which don't define O_BINARY, don't need it :-) -#ifndef O_BINARY -#define O_BINARY 0 -#endif typedef struct _attr_t attr_t; typedef struct _expr_t expr_t;

1 0

[gbrunmar] 32188: Fixed a compiler warning with msvc
by gbrunmar＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: gbrunmar Date: Thu Feb 7 20:26:05 2008 New Revision: 32188 URL: http://svn.reactos.org/svn/reactos?rev=32188&view=rev Log: Fixed a compiler warning with msvc Modified: trunk/reactos/dll/directx/d3d9/d3d9.c Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Thu Feb 7 20:26:05 2008 @@ -72,7 +72,7 @@ { if (0 != LoadDebugDll) { - hDebugDll = LoadLibrary("d3d9d.dll"); + hDebugDll = LoadLibraryA("d3d9d.dll"); if (0 != hDebugDll) {

1 0

[cfinck] 32187: creat() is equivalent to open() with the flags O_CREAT | O_WRONLY | O_TRUNC. Use these flags and O_BINARY to replace the creat() call we previously had. Requested by Wine for patch acceptance
by cfinck＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: cfinck Date: Thu Feb 7 17:53:03 2008 New Revision: 32187 URL: http://svn.reactos.org/svn/reactos?rev=32187&view=rev Log: creat() is equivalent to open() with the flags O_CREAT | O_WRONLY | O_TRUNC. Use these flags and O_BINARY to replace the creat() call we previously had. Requested by Wine for patch acceptance Modified: trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Thu Feb 7 17:53:03 2008 @@ -140,7 +140,7 @@ retval = TYPE_E_IOERROR; - fd = creat(typelib->typelib->filename, 0666); -+ fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); ++ fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Thu Feb 7 17:53:03 2008 @@ -2413,7 +2413,7 @@ retval = TYPE_E_IOERROR; - fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); + fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs