Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 25977: partly implement NtGdiDdReenableDirectDrawObject this give us bit more closer getting hardware accalertions working.
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sat Mar 3 23:19:56 2007 New Revision: 25977 URL: http://svn.reactos.org/svn/reactos?rev=25977&view=rev Log: partly implement NtGdiDdReenableDirectDrawObject this give us bit more closer getting hardware accalertions working. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Mar 3 23:19:56 2007 @@ -462,7 +462,7 @@ return Ret; } - /* + /* * Get puD3dBufferCallbacks */ if (puD3dBufferCallbacks != NULL) @@ -540,6 +540,58 @@ return Ret; } +BOOL STDCALL NtGdiDdReenableDirectDrawObject( + HANDLE hDirectDrawLocal, + BOOL *pubNewMode +) +{ + BOOL Ret=FALSE; + NTSTATUS Status = FALSE; + PDD_DIRECTDRAW pDirectDraw; + + if (hDirectDrawLocal == NULL) + { + return Ret; + } + + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, + GDI_OBJECT_TYPE_DIRECTDRAW); + + if (!pDirectDraw) + { + return Ret; + } + + /* + * FIXME detect mode change thic code maybe are not correct + * if we call on intEnableDriver it will cause some memory leak + * we need free the alloc memory before we call on it + */ + Ret = intEnableDriver(pDirectDraw); + + _SEH_TRY + { + ProbeForWrite(pubNewMode, sizeof(BOOL), 1); + *pubNewMode = Ret; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return Ret; + } + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + return Ret; + +} + + DWORD STDCALL NtGdiDdGetDriverInfo( HANDLE hDirectDrawLocal, Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Sat Mar 3 23:19:56 2007 @@ -304,15 +304,6 @@ return 0; } -BOOL STDCALL NtGdiDdReenableDirectDrawObject( - HANDLE hDirectDrawLocal, - BOOL *pubNewMode -) -{ - UNIMPLEMENTED - - return FALSE; -} BOOL STDCALL NtGdiDdReleaseDC( HANDLE hSurface

1 0

[ion] 25976: - Fix another typo in CommonDispatchException (with yet another critical flaw as a result). Sometimes, exceptions would incorrectly be detected as coming from user-mode even though CS was kernel mode. When creating the KTRAP_FRAME, the kernel would then add the Ring 3 RPL_MASK (3) (because it believed we're in usermode) to the kernel-mode CS, creating the invalid CS of 0xB, which would lead into a GPF during the iretd. - Re-enable DebugPrint since this now works.
by ion＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ion Date: Sat Mar 3 22:49:36 2007 New Revision: 25976 URL: http://svn.reactos.org/svn/reactos?rev=25976&view=rev Log: - Fix another typo in CommonDispatchException (with yet another critical flaw as a result). Sometimes, exceptions would incorrectly be detected as coming from user-mode even though CS was kernel mode. When creating the KTRAP_FRAME, the kernel would then add the Ring 3 RPL_MASK (3) (because it believed we're in usermode) to the kernel-mode CS, creating the invalid CS of 0xB, which would lead into a GPF during the iretd. - Re-enable DebugPrint since this now works. Modified: trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25976&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sat Mar 3 22:49:36 2007 @@ -23,7 +23,6 @@ IN ULONG Level) { /* Call the INT2D Service */ - return STATUS_SUCCESS; return DebugService(BREAKPOINT_PRINT, DebugString->Buffer, DebugString->Length, Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Sat Mar 3 22:49:36 2007 @@ -127,6 +127,7 @@ /* This we can handle: simply bump EIP */ Context->Eip++; + return TRUE; } /* Get out of here if the Debugger isn't connected */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sat Mar 3 22:49:36 2007 @@ -604,7 +604,7 @@ /* Set the record in ECX and check if this was V86 */ mov ecx, esp - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jz SetPreviousMode /* Set V86 mode */ @@ -791,6 +791,7 @@ sti PrepInt3: + /* Prepare the exception */ mov esi, ecx mov edi, edx

1 0

[ion] 25975: - Fix critical bugs in DR_TRAP_FIXUP, TRAP_PROLOG and TRAP_EPILOG which would either cause infinite loops during exceptions or corruption of the correct code path when dealing with debug registers. - Fix a bug in KiRecordDr7 setting the new DR7 mask. - Make KiEspToTrapFrame thread-safe by raising to APC_LEVEL to make sure a thread/set context doesn't corrupt the state. - Fix thread-safe IRQL Code in KeContexToTrapFrame/KeTrapFrameToContext. - Fix KiDispatchException to properly hand
by ion＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ion Date: Sat Mar 3 20:24:58 2007 New Revision: 25975 URL: http://svn.reactos.org/svn/reactos?rev=25975&view=rev Log: - Fix critical bugs in DR_TRAP_FIXUP, TRAP_PROLOG and TRAP_EPILOG which would either cause infinite loops during exceptions or corruption of the correct code path when dealing with debug registers. - Fix a bug in KiRecordDr7 setting the new DR7 mask. - Make KiEspToTrapFrame thread-safe by raising to APC_LEVEL to make sure a thread/set context doesn't corrupt the state. - Fix thread-safe IRQL Code in KeContexToTrapFrame/KeTrapFrameToContext. - Fix KiDispatchException to properly handle KI_EXCEPTION_ACCESS_VIOLATION and convert it back to STATUS_ACCESS_VIOLATION which is what the system expects. - Also fix the way we do bugchecks so the the trapframe gets properly put as a parameter. - Make KiDebugService call into KiTrap3 to share code (merge from kd-branch). - Changes to the KdpEnterDebuggerException hack we have to handle this change. - Temporarily disable DebugPrint functionality (sorry, I'm onto a big bug here!) Modified: trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25975&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sat Mar 3 20:24:58 2007 @@ -23,7 +23,7 @@ IN ULONG Level) { /* Call the INT2D Service */ - //return STATUS_SUCCESS; + return STATUS_SUCCESS; return DebugService(BREAKPOINT_PRINT, DebugString->Buffer, DebugString->Length, Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sat Mar 3 20:24:58 2007 @@ -304,7 +304,7 @@ /* Set them */ mov dr6, ebx mov dr7, ecx - jz 3f + jmp 3f .endm // @@ -482,12 +482,12 @@ /* Flush DR7 */ and dword ptr [ebp+KTRAP_FRAME_DR7], 0 -3: /* Check if the thread was being debugged */ test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF jnz Dr_&Label /* Set the Trap Frame Debug Header */ +3: SET_TF_DEBUG_HEADER .endm @@ -1171,7 +1171,7 @@ mov dr3, esi mov dr6, edi mov dr7, ebx - jz 4b + jmp 4b 7: /* Restore real CS value */ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Sat Mar 3 20:24:58 2007 @@ -106,9 +106,28 @@ IN BOOLEAN SecondChance) { KD_CONTINUE_TYPE Return; - - /* HACK (just like all this routine */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) Context->Eip++; + ULONG ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; + + /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->NumberParameters > 0) && + ((ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_UNLOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_COMMAND_STRING) || + (ExceptionCommand == BREAKPOINT_PRINT))) + { + /* Check if this is a debug print */ + if (ExceptionCommand == BREAKPOINT_PRINT) + { + /* Print the string */ + KdpServiceDispatcher(BREAKPOINT_PRINT, + (PVOID)ExceptionRecord->ExceptionInformation[1], + ExceptionRecord->ExceptionInformation[2]); + } + + /* This we can handle: simply bump EIP */ + Context->Eip++; + } /* Get out of here if the Debugger isn't connected */ if (KdDebuggerNotPresent) return FALSE; Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Sat Mar 3 20:24:58 2007 @@ -140,7 +140,7 @@ NewMask |= DR_MASK(DR7_OVERRIDE_V); /* Set DR7 override */ - *DrMask = DR7_OVERRIDE_MASK; + *DrMask |= DR7_OVERRIDE_MASK; } else { @@ -210,10 +210,19 @@ KiEspToTrapFrame(IN PKTRAP_FRAME TrapFrame, IN ULONG Esp) { - ULONG Previous = KiEspFromTrapFrame(TrapFrame); + KIRQL OldIrql; + ULONG Previous; + + /* Raise to APC_LEVEL if needed */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Get the old ESP */ + Previous = KiEspFromTrapFrame(TrapFrame); /* Check if this is user-mode or V86 */ - if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) + if ((TrapFrame->SegCs & MODE_MASK) || + (TrapFrame->EFlags & EFLAGS_V86_MASK)) { /* Write it directly */ TrapFrame->HardwareEsp = Esp; @@ -221,7 +230,11 @@ else { /* Don't allow ESP to be lowered, this is illegal */ - if (Esp < Previous) KeBugCheck(SET_OF_INVALID_CONTEXT); + if (Esp < Previous) KeBugCheckEx(SET_OF_INVALID_CONTEXT, + Esp, + Previous, + (ULONG_PTR)TrapFrame, + 0); /* Create an edit frame, check if it was alrady */ if (!(TrapFrame->SegCs & FRAME_EDITED)) @@ -243,6 +256,9 @@ } } } + + /* Restore IRQL */ + if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } ULONG @@ -316,12 +332,13 @@ PFX_SAVE_AREA FxSaveArea; ULONG i; BOOLEAN V86Switch = FALSE; - KIRQL OldIrql = APC_LEVEL; + KIRQL OldIrql; ULONG DrMask = 0; PVOID SafeDr; /* Do this at APC_LEVEL */ - if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the basic Registers */ if ((ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -544,7 +561,7 @@ else { /* FIXME: Handle FPU Emulation */ - ASSERT(FALSE); + //ASSERT(FALSE); } } @@ -600,11 +617,12 @@ FLOATING_SAVE_AREA UnalignedArea; } FloatSaveBuffer; FLOATING_SAVE_AREA *FloatSaveArea; - KIRQL OldIrql = APC_LEVEL; + KIRQL OldIrql; ULONG i; /* Do this at APC_LEVEL */ - if (KeGetCurrentIrql() < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); + OldIrql = KeGetCurrentIrql(); + if (OldIrql < APC_LEVEL) KeRaiseIrql(APC_LEVEL, &OldIrql); /* Start with the Control flags */ if ((Context->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL) @@ -817,11 +835,26 @@ /* Get a Context */ KeTrapFrameToContext(TrapFrame, ExceptionFrame, &Context); - /* Fix up EIP */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) - { - /* Decrement EIP by one */ - Context.Eip--; + /* Look at our exception code */ + switch (ExceptionRecord->ExceptionCode) + { + /* Breapoint */ + case STATUS_BREAKPOINT: + + /* Decrement EIP by one */ + Context.Eip--; + break; + + /* Internal exception */ + case KI_EXCEPTION_ACCESS_VIOLATION: + + /* Set correct code */ + ExceptionRecord->ExceptionCode = STATUS_ACCESS_VIOLATION; + if (PreviousMode == UserMode) + { + /* FIXME: Handle no execute */ + } + break; } /* Sanity check */ @@ -866,8 +899,8 @@ KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode, (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1]); + (ULONG_PTR)TrapFrame, + 0); } else { @@ -989,8 +1022,8 @@ KeBugCheckEx(KMODE_EXCEPTION_NOT_HANDLED, ExceptionRecord->ExceptionCode, (ULONG_PTR)ExceptionRecord->ExceptionAddress, - ExceptionRecord->ExceptionInformation[0], - ExceptionRecord->ExceptionInformation[1]); + (ULONG_PTR)TrapFrame, + 0); } Handled: Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sat Mar 3 20:24:58 2007 @@ -473,43 +473,8 @@ mov ecx, [ebp+KTRAP_FRAME_ECX] mov edx, [ebp+KTRAP_FRAME_EDX] - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotUserMode - - /* Check if this is kernel or user-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jnz NotUserMode - - /* Re-enable interrupts */ -VdmProc: - sti - - /* Call the debug routine */ -CallDispatch: - mov esi, ecx - mov edi, edx - mov edx, eax - mov ecx, 3 - push edi - push esi - push edx - call _KdpServiceDispatcher@12 - -NotUserMode: - - /* Get the current process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this is a VDM Process */ - //cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - //jz VdmProc - - /* Exit through common routine */ - jmp _Kei386EoiHelper@0 + /* Jump to INT3 handler */ + jmp PrepareInt3 .endfunc .func NtRaiseException@12

1 0

[greatlrd] 25974: merge down r25973 from trunk
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sat Mar 3 19:32:57 2007 New Revision: 25974 URL: http://svn.reactos.org/svn/reactos?rev=25974&view=rev Log: merge down r25973 from trunk Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Mar 3 19:32:57 2007 @@ -97,6 +97,8 @@ GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } + + /* The driver are not respnose to alloc the memory for pvmList * but it is win32k responsible todo, Windows 9x it is gdi32.dll @@ -288,11 +290,17 @@ { PDD_DIRECTDRAW pDirectDraw; NTSTATUS Status = FALSE; + BOOL Ret=FALSE; + + /* FIXME the workaround for 0.3.1 pseh bugs + * we should not need todo if (pHalInfo != NULL) + * so on + */ DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (hDirectDrawLocal == NULL) { - return FALSE; + return Ret; } pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, @@ -300,68 +308,217 @@ if (!pDirectDraw) { - return FALSE; - } + return Ret; + } + + /* + * Get pHalInfo + */ + if (pHalInfo != NULL) + { + DPRINT1("copy &pDirectDraw->Hal to pHalInfo\n"); + _SEH_TRY + { + ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); + RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + + /* + * Get pCallBackFlags + */ + if (pCallBackFlags != NULL) + { + DPRINT1("copy &CallBackFlags to pCallBackFlags\n"); + _SEH_TRY + { + ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); + pCallBackFlags[0]=pDirectDraw->DD.dwFlags; + pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; + pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get puD3dCallbacks + */ + if (puD3dCallbacks != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DHALCallbacks to puD3dCallbacks\n"); + if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) + { + _SEH_TRY + { + ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); + RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, + sizeof( D3DNTHAL_CALLBACKS ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get lpD3DGlobalDriverData + */ + if (puD3dDriverData != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DGlobalDriverData to puD3dDriverData\n"); + if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) + { + _SEH_TRY + { + LPD3DNTHAL_GLOBALDRIVERDATA MyD3d; + DPRINT1("Found DirectDraw GlobalDriverData for 3D Hal\n"); + MyD3d = (LPD3DNTHAL_GLOBALDRIVERDATA) pDirectDraw->Hal.lpD3DGlobalDriverData; + + /* Get puD3dDriverData */ + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, + sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + + /* Get puD3dTextureFormats */ + if (puD3dTextureFormats != NULL) + { + ProbeForWrite(puD3dTextureFormats, sizeof(DDSURFACEDESC) * MyD3d->dwNumTextureFormats, 1); + if (( MyD3d->lpTextureFormats != NULL) && ( MyD3d->dwNumTextureFormats != 0)) + { + RtlCopyMemory( puD3dTextureFormats, MyD3d->lpTextureFormats, sizeof(DDSURFACEDESC) * MyD3d->dwNumTextureFormats); + } + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get puD3dBufferCallbacks + */ + if (puD3dBufferCallbacks != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DGlobalDriverData to puD3dBufferCallbacks\n"); + if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); + _SEH_TRY + { + ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); + RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, + sizeof(DD_D3DBUFCALLBACKS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + DPRINT1("next\n"); _SEH_TRY { - ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); - RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); - - ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); - pCallBackFlags[0]=pDirectDraw->DD.dwFlags; - pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; - pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; - - if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - - ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); - RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, - sizeof( D3DNTHAL_CALLBACKS ) ); - } - - if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) - { - DPRINT1("Found DirectDraw Global DriverData \n"); - - ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); - RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, - sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - - if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); - ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); - RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, - sizeof(DD_D3DBUFCALLBACKS)); - } - - /* FIXME LPDDSURFACEDESC puD3dTextureFormats */ - - ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); - *puNumHeaps = pDirectDraw->dwNumHeaps; - - if (pDirectDraw->pvmList != NULL) - { - ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); - RtlCopyMemory( puvmList, - pDirectDraw->pvmList, - sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); - } - - ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); - *puNumFourCC = pDirectDraw->dwNumFourCC; - - if (pDirectDraw->pdwFourCC != NULL) - { - ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); - RtlCopyMemory( puFourCC, - pDirectDraw->pdwFourCC, - sizeof(DWORD) * pDirectDraw->dwNumFourCC); - } + ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); + *puNumHeaps = pDirectDraw->dwNumHeaps; + + if ((pDirectDraw->pvmList != NULL) && (puvmList != NULL)) + { + ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); + RtlCopyMemory( puvmList, pDirectDraw->pvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); + } + + ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); + *puNumFourCC = pDirectDraw->dwNumFourCC; + + if ((pDirectDraw->pdwFourCC != NULL) && (puFourCC != NULL)) + { + ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); + RtlCopyMemory( puFourCC, pDirectDraw->pdwFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC); + } } _SEH_HANDLE { @@ -369,15 +526,18 @@ } _SEH_END; + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - return FALSE; - } - - return TRUE; + } + else + { + Ret = TRUE; + } + return Ret; }

1 0

[greatlrd] 25973: NtGdiDdQueryDirectDrawObject 1. fixed some return code it get right.
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sat Mar 3 19:31:28 2007 New Revision: 25973 URL: http://svn.reactos.org/svn/reactos?rev=25973&view=rev Log: NtGdiDdQueryDirectDrawObject 1. fixed some return code it get right. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sat Mar 3 19:31:28 2007 @@ -97,6 +97,8 @@ GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } + + /* The driver are not respnose to alloc the memory for pvmList * but it is win32k responsible todo, Windows 9x it is gdi32.dll @@ -288,11 +290,17 @@ { PDD_DIRECTDRAW pDirectDraw; NTSTATUS Status = FALSE; + BOOL Ret=FALSE; + + /* FIXME the workaround for 0.3.1 pseh bugs + * we should not need todo if (pHalInfo != NULL) + * so on + */ DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (hDirectDrawLocal == NULL) { - return FALSE; + return Ret; } pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, @@ -300,68 +308,217 @@ if (!pDirectDraw) { - return FALSE; - } + return Ret; + } + + /* + * Get pHalInfo + */ + if (pHalInfo != NULL) + { + DPRINT1("copy &pDirectDraw->Hal to pHalInfo\n"); + _SEH_TRY + { + ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); + RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + + /* + * Get pCallBackFlags + */ + if (pCallBackFlags != NULL) + { + DPRINT1("copy &CallBackFlags to pCallBackFlags\n"); + _SEH_TRY + { + ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); + pCallBackFlags[0]=pDirectDraw->DD.dwFlags; + pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; + pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get puD3dCallbacks + */ + if (puD3dCallbacks != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DHALCallbacks to puD3dCallbacks\n"); + if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) + { + _SEH_TRY + { + ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); + RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, + sizeof( D3DNTHAL_CALLBACKS ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get lpD3DGlobalDriverData + */ + if (puD3dDriverData != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DGlobalDriverData to puD3dDriverData\n"); + if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) + { + _SEH_TRY + { + LPD3DNTHAL_GLOBALDRIVERDATA MyD3d; + DPRINT1("Found DirectDraw GlobalDriverData for 3D Hal\n"); + MyD3d = (LPD3DNTHAL_GLOBALDRIVERDATA) pDirectDraw->Hal.lpD3DGlobalDriverData; + + /* Get puD3dDriverData */ + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, + sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + + /* Get puD3dTextureFormats */ + if (puD3dTextureFormats != NULL) + { + ProbeForWrite(puD3dTextureFormats, sizeof(DDSURFACEDESC) * MyD3d->dwNumTextureFormats, 1); + if (( MyD3d->lpTextureFormats != NULL) && ( MyD3d->dwNumTextureFormats != 0)) + { + RtlCopyMemory( puD3dTextureFormats, MyD3d->lpTextureFormats, sizeof(DDSURFACEDESC) * MyD3d->dwNumTextureFormats); + } + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + /* + * Get puD3dBufferCallbacks + */ + if (puD3dBufferCallbacks != NULL) + { + DPRINT1("copy pDirectDraw->Hal.lpD3DGlobalDriverData to puD3dBufferCallbacks\n"); + if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); + _SEH_TRY + { + ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); + RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, + sizeof(DD_D3DBUFCALLBACKS)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); + SetLastNtError(Status); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + } + } + else + { + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return Ret; + } + + DPRINT1("next\n"); _SEH_TRY { - ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); - RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); - - ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); - pCallBackFlags[0]=pDirectDraw->DD.dwFlags; - pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; - pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; - - if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - - ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); - RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, - sizeof( D3DNTHAL_CALLBACKS ) ); - } - - if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) - { - DPRINT1("Found DirectDraw Global DriverData \n"); - - ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); - RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, - sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - - if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); - ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); - RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, - sizeof(DD_D3DBUFCALLBACKS)); - } - - /* FIXME LPDDSURFACEDESC puD3dTextureFormats */ - - ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); - *puNumHeaps = pDirectDraw->dwNumHeaps; - - if (pDirectDraw->pvmList != NULL) - { - ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); - RtlCopyMemory( puvmList, - pDirectDraw->pvmList, - sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); - } - - ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); - *puNumFourCC = pDirectDraw->dwNumFourCC; - - if (pDirectDraw->pdwFourCC != NULL) - { - ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); - RtlCopyMemory( puFourCC, - pDirectDraw->pdwFourCC, - sizeof(DWORD) * pDirectDraw->dwNumFourCC); - } + ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); + *puNumHeaps = pDirectDraw->dwNumHeaps; + + if ((pDirectDraw->pvmList != NULL) && (puvmList != NULL)) + { + ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); + RtlCopyMemory( puvmList, pDirectDraw->pvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); + } + + ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); + *puNumFourCC = pDirectDraw->dwNumFourCC; + + if ((pDirectDraw->pdwFourCC != NULL) && (puFourCC != NULL)) + { + ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); + RtlCopyMemory( puFourCC, pDirectDraw->pdwFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC); + } } _SEH_HANDLE { @@ -369,15 +526,18 @@ } _SEH_END; + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - return FALSE; - } - - return TRUE; + } + else + { + Ret = TRUE; + } + return Ret; }

1 0

[greatlrd] 25972: forget the dprint change in framebased.h
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sat Mar 3 16:52:13 2007 New Revision: 25972 URL: http://svn.reactos.org/svn/reactos?rev=25972&view=rev Log: forget the dprint change in framebased.h Modified: branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h Modified: branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h (original) +++ branches/ros-branch-0_3_1/reactos/include/reactos/libs/pseh/framebased.h Sat Mar 3 16:52:13 2007 @@ -71,8 +71,8 @@ _SEHPortableTryLevel_t * trylevel ) { - // DbgPrint("_SEHCompilerSpecificHandler(%p)\n", trylevel); _SEHTryLevel_t * mytrylevel; + DbgPrint("_SEHCompilerSpecificHandler(%p)\n", trylevel); mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); }

1 0

[fireball] 25971: ReactOS FOSDEM 2007 talk slides
by fireball＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: fireball Date: Sat Mar 3 16:17:47 2007 New Revision: 25971 URL: http://svn.reactos.org/svn/reactos?rev=25971&view=rev Log: ReactOS FOSDEM 2007 talk slides Added: trunk/press-media/presentations/FOSDEM-2007/ trunk/press-media/presentations/FOSDEM-2007/reactos_fosdem_2007.ppt (with props) Added: trunk/press-media/presentations/FOSDEM-2007/reactos_fosdem_2007.ppt URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/FOSDEM-2… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/FOSDEM-2007/reactos_fosdem_2007.ppt ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[ekohl] 25970: - Let the user edit the font size directly. - Remove the useless "NOT CBS_SIMPLE" window style from the font size combobox.
by ekohl＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: ekohl Date: Sat Mar 3 15:44:09 2007 New Revision: 25970 URL: http://svn.reactos.org/svn/reactos?rev=25970&view=rev Log: - Let the user edit the font size directly. - Remove the useless "NOT CBS_SIMPLE" window style from the font size combobox. Modified: trunk/reactos/dll/cpl/desk/Fr.rc trunk/reactos/dll/cpl/desk/It.rc trunk/reactos/dll/cpl/desk/Ja.rc trunk/reactos/dll/cpl/desk/Uk.rc trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/cz.rc trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/es.rc trunk/reactos/dll/cpl/desk/gr.rc trunk/reactos/dll/cpl/desk/hu.rc trunk/reactos/dll/cpl/desk/id-ID.rc trunk/reactos/dll/cpl/desk/nl.rc trunk/reactos/dll/cpl/desk/pl.rc trunk/reactos/dll/cpl/desk/ru-RU.rc Modified: trunk/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Fr.rc (original) +++ trunk/reactos/dll/cpl/desk/Fr.rc Sat Mar 3 15:44:09 2007 @@ -95,15 +95,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -196,7 +196,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/It.rc (original) +++ trunk/reactos/dll/cpl/desk/It.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Ja.rc (original) +++ trunk/reactos/dll/cpl/desk/Ja.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (original) +++ trunk/reactos/dll/cpl/desk/Uk.rc Sat Mar 3 15:44:09 2007 @@ -100,15 +100,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -201,7 +201,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Sat Mar 3 15:44:09 2007 @@ -468,6 +468,20 @@ } +static INT +GetEditedComboInt(HWND hwnd, INT id) +{ + INT nCount; + BOOL bTranslated; + + nCount = GetDlgItemInt(hwnd, id, &bTranslated, FALSE); + if (bTranslated == FALSE) + return 12; + + return nCount; +} + + INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -614,6 +628,41 @@ ReleaseDC(hwndDlg, hdcDlg); } + else if (g && HIWORD(wParam) == CBN_EDITCHANGE) + { + HDC hdcDlg = GetDC(hwndDlg); + INT i; + + switch (g->CurrentElement) + { + case IDX_INACTIVE_CAPTION: + case IDX_ACTIVE_CAPTION: + i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_MENU: + i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + + case IDX_DIALOG: + i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = + -MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0, + (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]); + break; + } + + ReleaseDC(hwndDlg, hdcDlg); + } break; case IDC_ADVAPPEARANCE_COLOR1_B: Modified: trunk/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/cz.rc (original) +++ trunk/reactos/dll/cpl/desk/cz.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Sat Mar 3 15:44:09 2007 @@ -89,18 +89,18 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "Schriftart:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Schriftgra&d:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Fa&rbe:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "F", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "K ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "K ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Bildlaufleiste" IDS_ELEMENT_10 "3D-Objekte" IDS_ELEMENT_11 "Palettentitel" - IDS_ELEMENT_12 "Symboltitel" + IDS_ELEMENT_12 "Symboltitel" IDS_ELEMENT_13 "Titelleistenschaltfläche" IDS_ELEMENT_14 "Deaktiviertes Menüelement" IDS_ELEMENT_15 "Dialogfeld" Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/es.rc (original) +++ trunk/reactos/dll/cpl/desk/es.rc Sat Mar 3 15:44:09 2007 @@ -99,15 +99,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -200,7 +200,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/gr.rc (original) +++ trunk/reactos/dll/cpl/desk/gr.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/hu.rc (original) +++ trunk/reactos/dll/cpl/desk/hu.rc Sat Mar 3 15:44:09 2007 @@ -93,15 +93,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -194,7 +194,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/id-ID.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/id-ID.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Besar Font:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Warna:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "Obyek 3D" IDS_ELEMENT_11 "Judul Palet" - IDS_ELEMENT_12 "Judul Simbol" + IDS_ELEMENT_12 "Judul Simbol" IDS_ELEMENT_13 "Bar judul" IDS_ELEMENT_14 "Elemen menu Deaktivasi" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/nl.rc (original) +++ trunk/reactos/dll/cpl/desk/nl.rc Sat Mar 3 15:44:09 2007 @@ -92,7 +92,7 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP @@ -100,7 +100,7 @@ AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=259… ============================================================================== --- trunk/reactos/dll/cpl/desk/pl.rc (original) +++ trunk/reactos/dll/cpl/desk/pl.rc Sat Mar 3 15:44:09 2007 @@ -93,15 +93,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -194,7 +194,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog" Modified: trunk/reactos/dll/cpl/desk/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/ru-RU.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/ru-RU.rc Sat Mar 3 15:44:09 2007 @@ -92,15 +92,15 @@ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 - COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE | CBS_DROPDOWN | WS_VSCROLL + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE - - PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END @@ -193,7 +193,7 @@ IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Symbol title" IDS_ELEMENT_13 "Captionbar" IDS_ELEMENT_14 "Deactivated menu elements" IDS_ELEMENT_15 "Dialog"

1 0

[spetreolle] 25969: downloader fixes: remove downloader.xml from bootcd fix paths in .rbuild
by spetreolle＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: spetreolle Date: Sat Mar 3 14:41:28 2007 New Revision: 25969 URL: http://svn.reactos.org/svn/reactos?rev=25969&view=rev Log: downloader fixes: remove downloader.xml from bootcd fix paths in .rbuild Modified: trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild (original) +++ trunk/reactos/base/applications/downloader/packagetree/internet/browser/browser.rbuild Sat Mar 3 14:41:28 2007 @@ -1,4 +1,4 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<installfile base="packagetree\internet\browser">firefox.1.5.0.9.dml</installfile> -<installfile base="packagetree\internet\browser">firefox.2.0.0.1.dml</installfile> +<installfile base="packagetree/internet/browser">firefox.1.5.0.9.dml</installfile> +<installfile base="packagetree/internet/browser">firefox.2.0.0.1.dml</installfile> Modified: trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild (original) +++ trunk/reactos/base/applications/downloader/packagetree/internet/internet.rbuild Sat Mar 3 14:41:28 2007 @@ -3,4 +3,4 @@ <directory name="browser"> <xi:include href="browser/browser.rbuild" /> </directory> -<installfile base="packagetree\internet">category.xml</installfile> +<installfile base="packagetree/internet">category.xml</installfile> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Mar 3 14:41:28 2007 @@ -39,7 +39,6 @@ base\applications\devmgr\devmgrapp.exe 1 base\applications\devmgmt\devmgmt.exe 1 base\applications\downloader\downloader.exe 1 -base\applications\downloader\downloader.xml 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\getfirefox\getfirefox.exe 1

1 0

[greatlrd] 25968: update my private doc
by greatlrd＠svn.reactos.org 03 Mar '07

03 Mar '07

Author: greatlrd Date: Sat Mar 3 13:33:22 2007 New Revision: 25968 URL: http://svn.reactos.org/svn/reactos?rev=25968&view=rev Log: update my private doc Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (original) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Sat Mar 3 13:33:22 2007 @@ -13,16 +13,19 @@ \par \par \par -\b VMWARE\par +\b Real Hardware / VMWARE\par \par -\b0 1. AMD64 CPU with 32/64 bits OS VBE drv will not working in 3 boot\line\par - workaround : powerdown the virtualmachine before you boot to 3 boot then wait \line few second. then power it up. it works for me. \par +\b0 1. AMD 64/AMD XP CPU with 32/64 bits OS VBE drv will not working in 3 boot\line\par + workaround : none \par \line posible fix/patch : ntoskrnl/ke/trap.s line 1559 \par it is \lang1024\f1 NotV86: function that need handling of\par CheckPrivilegedInstruction2 implement when it\par is done. This bug will maybe disaper or maybe\line some other serius bug will popup. \lang1033\f0\par \par -2. VMWARE own display drv can not change the reslutions in ReactOS.\line workaround : unkonwn \b\par +\par +\b VMWARE\par +\par +\b0 1. VMWARE own display drv can not change the reslutions in ReactOS.\line workaround : unkonwn \b\par \b0 posible fix/patch : check if all key have been created as they should.\par if not we need fix our vmware drv install to create \line thuse keys. posible regress is the cmlib that \par correct behovir of some api.\par @@ -43,6 +46,12 @@ 6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\b0\par 1. cmd md\par 2. vmware can not change resultions. \par +\par +\b Known problem \par +\b0 pseh can go into a loop, in some conditions,\par +but it is not a bug in pseh, it some where else\par +some value getting fill in wrong or restore wrong\par +\line\par \b\line\par \par }

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