Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[aandrejevic] 61160: [FAST486] Revert r61158, and fix the prefix issue correctly, but resetting the flags again after the call to Fast486InterruptInternal.
by aandrejevic＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: aandrejevic Date: Sat Nov 30 23:45:59 2013 New Revision: 61160 URL: http://svn.reactos.org/svn/reactos?rev=61160&view=rev Log: [FAST486] Revert r61158, and fix the prefix issue correctly, but resetting the flags again after the call to Fast486InterruptInternal. Modified: branches/ntvdm/lib/fast486/fast486.c Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Nov 30 23:45:59 2013 @@ -84,6 +84,9 @@ continue; } + /* A non-prefix opcode has been executed, reset the prefix flags */ + State->PrefixFlags = 0; + /* * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. @@ -100,6 +103,9 @@ IdtEntry.Selector, MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), IdtEntry.Type); + + /* Restore the prefix flags, which would be set to OPSIZE for 32-bit real mode */ + State->PrefixFlags = 0; } /* Clear the interrupt status */ @@ -115,9 +121,6 @@ /* Set the interrupt status to execute on the next instruction */ State->IntStatus = FAST486_INT_EXECUTE; } - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; } while ((Command == FAST486_CONTINUE) || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0)

1 0

[aandrejevic] 61159: [FAST486] Use the size of CS, and not SS, in Fast486OpcodePopReg.
by aandrejevic＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: aandrejevic Date: Sat Nov 30 23:14:54 2013 New Revision: 61159 URL: http://svn.reactos.org/svn/reactos?rev=61159&view=rev Log: [FAST486] Use the size of CS, and not SS, in Fast486OpcodePopReg. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Nov 30 23:14:54 2013 @@ -541,7 +541,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodePopReg) { ULONG Value; - BOOLEAN Size = State->SegmentRegs[FAST486_REG_SS].Size; + BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; TOGGLE_OPSIZE(Size); NO_LOCK_PREFIX();

1 0

[aandrejevic] 61158: [FAST486] Move the prefix reset below the interrupt check, because Fast486InterruptInternal might set OPSIZE in some circumstances.
by aandrejevic＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: aandrejevic Date: Sat Nov 30 22:17:18 2013 New Revision: 61158 URL: http://svn.reactos.org/svn/reactos?rev=61158&view=rev Log: [FAST486] Move the prefix reset below the interrupt check, because Fast486InterruptInternal might set OPSIZE in some circumstances. Modified: branches/ntvdm/lib/fast486/fast486.c Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Nov 30 22:17:18 2013 @@ -58,7 +58,12 @@ if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; /* Perform an instruction fetch */ - if (!Fast486FetchByte(State, &Opcode)) continue; + if (!Fast486FetchByte(State, &Opcode)) + { + /* Exception occurred */ + State->PrefixFlags = 0; + continue; + } // TODO: Check for CALL/RET to update ProcedureCallCount. @@ -78,9 +83,6 @@ /* This is a prefix, go to the next instruction immediately */ continue; } - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; /* * Check if there is an interrupt to execute, or a hardware interrupt signal @@ -113,6 +115,9 @@ /* Set the interrupt status to execute on the next instruction */ State->IntStatus = FAST486_INT_EXECUTE; } + + /* A non-prefix opcode has been executed, reset the prefix flags */ + State->PrefixFlags = 0; } while ((Command == FAST486_CONTINUE) || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0)

1 0

[hbelusca] 61157: [NTVDM] - Remove some DPRINTs. - Fix a bug in VgaEnterGraphicsMode (erroneous change of the real saved resolution when going into DoubleVision(TM) mode). - Do not update the text ...
by hbelusca＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: hbelusca Date: Sat Nov 30 22:01:44 2013 New Revision: 61157 URL: http://svn.reactos.org/svn/reactos?rev=61157&view=rev Log: [NTVDM] - Remove some DPRINTs. - Fix a bug in VgaEnterGraphicsMode (erroneous change of the real saved resolution when going into DoubleVision(TM) mode). - Do not update the text cursor when being in graphics mode (otherwise I've already hit some ScanlineSize==0 problems) <-- [TheFlash], can you recheck that, please? - Little optimisation: do not do anything in VgaRefreshDisplay if nothing has to be done. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sat Nov 30 22:01:44 2013 @@ -124,7 +124,13 @@ static BOOLEAN ModeChanged = TRUE; static BOOLEAN CursorMoved = FALSE; static BOOLEAN PaletteChanged = FALSE; -static BOOLEAN TextMode = TRUE; + +static +enum SCREEN_MODE +{ + TEXT_MODE, + GRAPHICS_MODE +} ScreenMode = TEXT_MODE; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; @@ -263,8 +269,6 @@ static inline VOID VgaMarkForUpdate(SHORT Row, SHORT Column) { - DPRINT("VgaMarkForUpdate: Row %d, Column %d\n", Row, Column); - /* Check if this is the first time the rectangle is updated */ if (!NeedsUpdate) { @@ -304,7 +308,6 @@ { /* The GC misc register decides if it's text or graphics mode */ ModeChanged = TRUE; - break; } } @@ -326,7 +329,6 @@ { /* The video mode has changed */ ModeChanged = TRUE; - break; } @@ -337,7 +339,6 @@ { /* Set the cursor moved flag */ CursorMoved = TRUE; - break; } } @@ -444,22 +445,26 @@ LPBITMAPINFO BitmapInfo = (LPBITMAPINFO)BitmapInfoBuffer; LPWORD PaletteIndex = (LPWORD)(BitmapInfo->bmiColors); - if ((Resolution->X < VGA_MINIMUM_WIDTH) && (Resolution->Y < VGA_MINIMUM_HEIGHT)) + LONG Width = Resolution->X; + LONG Height = Resolution->Y; + + /* Use DoubleVision mode if the resolution is too small */ + if (Width < VGA_MINIMUM_WIDTH && Height < VGA_MINIMUM_HEIGHT) { DoubleVision = TRUE; - Resolution->X *= 2; - Resolution->Y *= 2; + Width *= 2; + Height *= 2; } /* Fill the bitmap info header */ ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); - BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = Resolution->X; - BitmapInfo->bmiHeader.biHeight = Resolution->Y; + BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + BitmapInfo->bmiHeader.biWidth = Width; + BitmapInfo->bmiHeader.biHeight = Height; BitmapInfo->bmiHeader.biBitCount = 8; - BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biPlanes = 1; BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biSizeImage = Resolution->X * Resolution->Y /* * 1 == biBitCount / 8 */; + BitmapInfo->bmiHeader.biSizeImage = Width * Height /* * 1 == biBitCount / 8 */; /* Fill the palette data */ for (i = 0; i < (VGA_PALETTE_SIZE / 3); i++) PaletteIndex[i] = (WORD)i; @@ -492,8 +497,8 @@ PaletteHandle, SYSPAL_NOSTATIC256); - /* Clear the text mode flag */ - TextMode = FALSE; + /* Set the screen mode flag */ + ScreenMode = GRAPHICS_MODE; return TRUE; } @@ -544,8 +549,8 @@ PaletteHandle, SYSPAL_NOSTATIC256); - /* Set the text mode flag */ - TextMode = TRUE; + /* Set the screen mode flag */ + ScreenMode = TEXT_MODE; return TRUE; } @@ -564,7 +569,7 @@ /* Reset the mode change flag */ // ModeChanged = FALSE; - if (!TextMode) + if (ScreenMode == GRAPHICS_MODE) { /* Leave the current graphics mode */ VgaLeaveGraphicsMode(); @@ -750,6 +755,7 @@ PixelData = VgaAcRegisters[PixelData]; } + /* Take into account DoubleVision mode when checking for pixel updates */ if (DoubleVision) { /* Now check if the resulting pixel data has changed */ @@ -838,6 +844,9 @@ WORD Location = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG], VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG]); + /* Just return if we are not in text mode */ + if ((VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) != 0) return; + if (CursorStart < CursorEnd) { /* Visible cursor */ @@ -927,9 +936,17 @@ VOID VgaRefreshDisplay(VOID) { HANDLE ConsoleBufferHandle = NULL; - COORD Resolution = VgaGetDisplayResolution(); - - DPRINT("VgaRefreshDisplay\n"); + COORD Resolution; + + /* Set the vertical retrace flag */ + InVerticalRetrace = TRUE; + + /* If nothing has changed, just return */ + if (!ModeChanged && !CursorMoved && !PaletteChanged && !NeedsUpdate) + return; + + /* Retrieve the current resolution */ + Resolution = VgaGetDisplayResolution(); /* Change the display mode */ if (ModeChanged) VgaChangeMode(); @@ -952,9 +969,6 @@ /* Update the contents of the framebuffer */ VgaUpdateFramebuffer(); - /* Set the vertical retrace flag */ - InVerticalRetrace = TRUE; - /* Ignore if there's nothing to update */ if (!NeedsUpdate) return; @@ -984,12 +998,12 @@ &UpdateRectangle); } + /* In DoubleVision mode, scale the update rectangle */ if (DoubleVision) { - /* Scale the update rectangle */ UpdateRectangle.Left *= 2; - UpdateRectangle.Top *= 2; - UpdateRectangle.Right = UpdateRectangle.Right * 2 + 1; + UpdateRectangle.Top *= 2; + UpdateRectangle.Right = UpdateRectangle.Right * 2 + 1; UpdateRectangle.Bottom = UpdateRectangle.Bottom * 2 + 1; } @@ -1011,9 +1025,7 @@ DWORD i; DWORD VideoAddress; - DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", - Address, - Size); + DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); /* Ignore if video RAM access is disabled */ if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return; @@ -1039,9 +1051,7 @@ DWORD i, j; DWORD VideoAddress; - DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", - Address, - Size); + DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, Size); /* Ignore if video RAM access is disabled */ if (!(VgaMiscRegister & VGA_MISC_RAM_ENABLED)) return;

1 0

[dreimer] 61156: Modify reactos.dff.in to include the optional files the same way the autogenerated reactos.dff does. Meaning all paths in "path/to.here" style. This fixes the inclusion into the Re...
by dreimer＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: dreimer Date: Sat Nov 30 16:29:55 2013 New Revision: 61156 URL: http://svn.reactos.org/svn/reactos?rev=61156&view=rev Log: Modify reactos.dff.in to include the optional files the same way the autogenerated reactos.dff does. Meaning all paths in "path/to.here" style. This fixes the inclusion into the ReactOS system. (Included Gecko, Runtimes and sound drivers now are detected and used while setup) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat Nov 30 16:29:55 2013 @@ -40,25 +40,25 @@ .InfEnd ; Optional/proprietary files -modules\optional\DroidSansFallback.ttf 3 optional -modules\optional\NOTICE_for_Droid_Font.txt 4 optional -modules\optional\netkvm2k.inf 6 optional -modules\optional\netkvm2k.cat 6 optional -modules\optional\netkvm.sys 2 optional -modules\optional\alcxwdm.inf 6 optional -modules\optional\alcxwdm.sys 2 optional -modules\optional\mfc42.dll 1 optional -modules\optional\mfc42u.dll 1 optional -modules\optional\mfc71.dll 1 optional -modules\optional\mfc71u.dll 1 optional -modules\optional\msvbvm50.dll 1 optional -modules\optional\msvbvm60.dll 1 optional -modules\optional\msvcirt.dll 1 optional -modules\optional\msvcp71.dll 1 optional -modules\optional\msvcr71.dll 1 optional -modules\optional\vmx_fb.dll 1 optional -modules\optional\vmx_mode.dll 1 optional -modules\optional\vmx_svga.inf 6 optional -modules\optional\vmx_svga.sys 2 optional -modules\optional\wine_gecko-2.21-x86.msi 4 optional -boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional +"modules/optional/DroidSansFallback.ttf" 3 optional +"modules/optional/NOTICE_for_Droid_Font.txt" 4 optional +"modules/optional/netkvm2k.inf" 6 optional +"modules/optional/netkvm2k.cat" 6 optional +"modules/optional/netkvm.sys" 2 optional +"modules/optional/alcxwdm.inf" 6 optional +"modules/optional/alcxwdm.sys" 2 optional +"modules/optional/mfc42.dll" 1 optional +"modules/optional/mfc42u.dll" 1 optional +"modules/optional/mfc71.dll" 1 optional +"modules/optional/mfc71u.dll" 1 optional +"modules/optional/msvbvm50.dll" 1 optional +"modules/optional/msvbvm60.dll" 1 optional +"modules/optional/msvcirt.dll" 1 optional +"modules/optional/msvcp71.dll" 1 optional +"modules/optional/msvcr71.dll" 1 optional +"modules/optional/vmx_fb.dll" 1 optional +"modules/optional/vmx_mode.dll" 1 optional +"modules/optional/vmx_svga.inf" 6 optional +"modules/optional/vmx_svga.sys" 2 optional +"modules/optional/wine_gecko-2.21-x86.msi" 4 optional +"boot/bootdata/bootcdregtest/AHKAppTests.cmd" 7 optional

1 0

[dreimer] 61155: Update DejaVu Sans/Serif Fonts to Version 2.3.4. Update "3rd Party Files.txt"
by dreimer＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: dreimer Date: Sat Nov 30 16:25:58 2013 New Revision: 61155 URL: http://svn.reactos.org/svn/reactos?rev=61155&view=rev Log: Update DejaVu Sans/Serif Fonts to Version 2.3.4. Update "3rd Party Files.txt" Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sat Nov 30 16:25:58 2013 @@ -3,56 +3,45 @@ Other Things synched with other projects: Title: RedHat Liberation Fonts -Used Version: 1.06 -Latest Version: 1.06 +Used Version: 2.00 Website: https://www.redhat.com/promo/fonts/ Title: DejaVu Fonts -Used Version: 2.33 -Latest Version: 2.33 +Used Version: 2.34 Website: http://dejavu.sourceforge.net Title: DXTN OpenGL Compression Libs Used Version: 1.1 -Latest Version: 1.1 Website: http://www.geocities.com/dborca/opengl/tc.html Title: FreeType Used Version: 2.5.0 -Latest Version: 2.5.0 Website: http://www.freetype.org Title: Mesa3D Used Version: 7.4 -Latest Version: 7.8.2 Website: http://www.mesa3d.org Title: GNU adns Used Version: 1.0 REV 5 -Latest Version: 1.0 REV 5 Website: http://www.chiark.greenend.org.uk/~ian/adns | http://adns.jgaa.com Title: BZip2 -Used Version: 1.0.5 -Latest Version: 1.0.5 +Used Version: 2.0.6 Website: http://www.bzip.org Title: Expat Used Version: 2.0 -Latest Version: 2.0.1 Website: http://expat.sourceforge.net Title: LibXML -Used Version: 2.7.6 -Latest Version: 2.7.7 +Used Version: 2.9.0 Website: http://xmlsoft.org Title: ZLib -Used Version: 1.2.3 -Latest Version: 1.2.5 +Used Version: 1.2.8 Website: http://www.zlib.net Title: GNU FreeFont -Used Version: 2010-09-19 -Latest Version: 2010-09-19 +Used Version: 2012-05-03 Website: http://savannah.gnu.org/projects/freefont/ Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 61154: [INF] Add an inf file for floppy disk drives. If you have a floppy disk drive attached to your computer, it should appear in the device manager.
by ekohl＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: ekohl Date: Sat Nov 30 10:22:29 2013 New Revision: 61154 URL: http://svn.reactos.org/svn/reactos?rev=61154&view=rev Log: [INF] Add an inf file for floppy disk drives. If you have a floppy disk drive attached to your computer, it should appear in the device manager. Added: trunk/reactos/media/inf/flpydisk.inf (with props) Modified: trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sat Nov 30 10:22:29 2013 @@ -11,6 +11,7 @@ disk.inf display.inf fdc.inf + flpydisk.inf font.inf hal.inf hdc.inf Added: trunk/reactos/media/inf/flpydisk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/flpydisk.inf?rev… ============================================================================== --- trunk/reactos/media/inf/flpydisk.inf (added) +++ trunk/reactos/media/inf/flpydisk.inf [iso-8859-1] Sat Nov 30 10:22:29 2013 @@ -0,0 +1,65 @@ +; FDC.INF + +; Installation file for floppy disk drives + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = FloppyDisk +ClassGuid = {4D36E980-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 08/15/2005,1.01.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = Floppy.NT.AddReg + +[Floppy.NT.AddReg] +HKR, , , 0, %FloppyClassName% +HKR, , Icon, 0, "-50" +HKR, , NoInstallClass, , 1 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +;FIXME: We do not have a driver yet +%Floppy.DeviceDesc% = NO_DRV, GenFloppyDisk +;%Floppy.DeviceDesc% = floppy_Inst, GenFloppyDisk + +;----------------------------- FDC DRIVER ----------------------------- + +[floppy_Inst.NT] +CopyFiles = floppy_CopyFiles.NT + +[floppy_CopyFiles.NT] +flpydisk.sys + +[flopy_Inst.NT.Services] +AddService = flpydisk, 0x00000002, floppy_Service_Inst + +[floppy_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\flpydisk.sys + + +;---------------------------- NO DRIVER REQ ----------------------------- + +[NO_DRV] + +[NO_DRV.Services] +AddService = , 0x00000002 + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +FloppyClassName = "Floppy disk drives" +GenericMfg = "(Generic floppy disk drives)" +Floppy.DeviceDesc = "Generic floppy disk drive" Propchange: trunk/reactos/media/inf/flpydisk.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sat Nov 30 10:22:29 2013 @@ -10,6 +10,7 @@ disk.inf display.inf fdc.inf +flpydisk.inf hal.inf hdc.inf input.inf

1 0

[ekohl] 61153: [FDC] Implement IRP_MN_QUERY_CAPABILITIES and IRP_MN_QUERY_ID for the PDOs.
by ekohl＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: ekohl Date: Sat Nov 30 10:07:50 2013 New Revision: 61153 URL: http://svn.reactos.org/svn/reactos?rev=61153&view=rev Log: [FDC] Implement IRP_MN_QUERY_CAPABILITIES and IRP_MN_QUERY_ID for the PDOs. Added: trunk/reactos/drivers/storage/fdc/fdc/misc.c (with props) Modified: trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt trunk/reactos/drivers/storage/fdc/fdc/fdc.h trunk/reactos/drivers/storage/fdc/fdc/fdo.c trunk/reactos/drivers/storage/fdc/fdc/pdo.c Modified: trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/CM… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/CMakeLists.txt [iso-8859-1] Sat Nov 30 10:07:50 2013 @@ -2,6 +2,7 @@ add_library(fdc SHARED fdc.c fdo.c + misc.c pdo.c fdc.rc) Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.h [iso-8859-1] Sat Nov 30 10:07:50 2013 @@ -22,9 +22,10 @@ { struct _CONTROLLER_INFO *ControllerInfo; UCHAR UnitNumber; /* 0,1,2,3 */ + ULONG PeripheralNumber; + PDEVICE_OBJECT DeviceObject; + CM_FLOPPY_DEVICE_DATA FloppyDeviceData; // LARGE_INTEGER MotorStartTime; - PDEVICE_OBJECT DeviceObject; - CM_FLOPPY_DEVICE_DATA FloppyDeviceData; // DISK_GEOMETRY DiskGeometry; // UCHAR BytesPerSectorCode; // WCHAR SymLinkBuffer[MAX_DEVICE_NAME]; @@ -98,20 +99,30 @@ UNICODE_STRING CompatibleIds; // REG_MULTI_SZ } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; +#define FDC_TAG 'acdF' /* fdo.c */ NTSTATUS NTAPI -FdcFdoPnp(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +FdcFdoPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* misc.c */ + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); /* pdo.c */ NTSTATUS NTAPI -FdcPdoPnp(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +FdcPdoPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); - -/* EOF */ +/* EOF */ Modified: trunk/reactos/drivers/storage/fdc/fdc/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] Sat Nov 30 10:07:50 2013 @@ -232,6 +232,7 @@ DriveInfo->ControllerInfo = &DeviceExtension->ControllerInfo; DriveInfo->UnitNumber = i; + DriveInfo->PeripheralNumber = PeripheralNumber; DriveInfo->FloppyDeviceData.MaxDensity = FloppyDeviceData->MaxDensity; DriveInfo->FloppyDeviceData.MountDensity = FloppyDeviceData->MountDensity; @@ -263,6 +264,63 @@ static NTSTATUS +PciCreateHardwareIDsString(PUNICODE_STRING HardwareIDs) +{ + WCHAR Buffer[256]; + UNICODE_STRING BufferU; + ULONG Index; + + Index = 0; + Index += swprintf(&Buffer[Index], + L"FDC\\GENERIC_FLOPPY_DRIVE"); + Index++; + + Buffer[Index] = UNICODE_NULL; + + BufferU.Length = BufferU.MaximumLength = (USHORT) Index * sizeof(WCHAR); + BufferU.Buffer = Buffer; + + return DuplicateUnicodeString(0, &BufferU, HardwareIDs); +} + + +static +NTSTATUS +PciCreateCompatibleIDsString(PUNICODE_STRING CompatibleIDs) +{ + WCHAR Buffer[256]; + UNICODE_STRING BufferU; + ULONG Index; + + Index = 0; + Index += swprintf(&Buffer[Index], + L"GenFloppyDisk"); + Index++; + + Buffer[Index] = UNICODE_NULL; + + BufferU.Length = BufferU.MaximumLength = (USHORT)Index * sizeof(WCHAR); + BufferU.Buffer = Buffer; + + return DuplicateUnicodeString(0, &BufferU, CompatibleIDs); +} + + +static +NTSTATUS +PciCreateInstanceIDString(PUNICODE_STRING InstanceID, + ULONG PeripheralNumber) +{ + WCHAR Buffer[3]; + + swprintf(Buffer, L"%02X", PeripheralNumber & 0xff); + + return RtlCreateUnicodeString(InstanceID, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; +} + + +static +NTSTATUS FdcFdoQueryBusRelations( IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_RELATIONS *DeviceRelations) @@ -352,6 +410,59 @@ Pdo->Flags |= DO_DIRECT_IO; Pdo->Flags |= DO_POWER_PAGABLE; Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Add Device ID string */ + RtlCreateUnicodeString(&PdoDeviceExtension->DeviceId, + L"FDC\\GENERIC_FLOPPY_DRIVE"); + DPRINT1("DeviceID: %S\n", PdoDeviceExtension->DeviceId.Buffer); + + /* Add Hardware IDs string */ + Status = PciCreateHardwareIDsString(&PdoDeviceExtension->HardwareIds); + if (!NT_SUCCESS(Status)) + { +// ErrorStatus = Status; +// ErrorOccurred = TRUE; + break; + } + + /* Add Compatible IDs string */ + Status = PciCreateCompatibleIDsString(&PdoDeviceExtension->CompatibleIds); + if (!NT_SUCCESS(Status)) + { +// ErrorStatus = Status; +// ErrorOccurred = TRUE; + break; + } + + /* Add Instance ID string */ + Status = PciCreateInstanceIDString(&PdoDeviceExtension->InstanceId, + DriveInfo->PeripheralNumber); + if (!NT_SUCCESS(Status)) + { +// ErrorStatus = Status; +// ErrorOccurred = TRUE; + break; + } + +#if 0 + /* Add device description string */ + Status = PciCreateDeviceDescriptionString(&PdoDeviceExtension->DeviceDescription, Device); + if (!NT_SUCCESS(Status)) + { +// ErrorStatus = Status; +// ErrorOccurred = TRUE; + break; + } + + /* Add device location string */ + Status = PciCreateDeviceLocationString(&PdoDeviceExtension->DeviceLocation, Device); + if (!NT_SUCCESS(Status)) + { +// ErrorStatus = Status; +// ErrorOccurred = TRUE; + break; + } +#endif } ObReferenceObject(DriveInfo->DeviceObject); Added: trunk/reactos/drivers/storage/fdc/fdc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/mi… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/misc.c (added) +++ trunk/reactos/drivers/storage/fdc/fdc/misc.c [iso-8859-1] Sat Nov 30 10:07:50 2013 @@ -0,0 +1,66 @@ +/* + * PROJECT: ReactOS Floppy Disk Controller Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/storage/fdc/fdc/misc.c + * PURPOSE: Misc Routines + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES *******************************************************************/ + +#include "fdc.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + USHORT DestMaxLength; + + if (SourceString == NULL || + DestinationString == NULL || + SourceString->Length > SourceString->MaximumLength || + (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || + Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + if ((SourceString->Length == 0) && + (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePoolWithTag(PagedPool, DestMaxLength, FDC_TAG); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/drivers/storage/fdc/fdc/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/fdc/fdc/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/pd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] Sat Nov 30 10:07:50 2013 @@ -12,14 +12,182 @@ /* FUNCTIONS ******************************************************************/ +static +NTSTATUS +FdcPdoQueryCapabilities( + IN PDEVICE_OBJECT DeviceObject, + PIO_STACK_LOCATION IrpSp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_CAPABILITIES DeviceCapabilities; + + DPRINT("Called\n"); + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; + + if (DeviceCapabilities->Version != 1) + return STATUS_UNSUCCESSFUL; + + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->Address = DeviceExtension->DriveInfo->PeripheralNumber; + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +FdcPdoQueryId( + IN PDEVICE_OBJECT DeviceObject, + IN PIO_STACK_LOCATION IrpSp, + OUT ULONG_PTR *Information) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PUNICODE_STRING SourceString; + UNICODE_STRING String; + NTSTATUS Status; + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RtlInitUnicodeString(&String, NULL); + + switch (IrpSp->Parameters.QueryId.IdType) + { + case BusQueryDeviceID: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + SourceString = &DeviceExtension->DeviceId; + break; + + case BusQueryHardwareIDs: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + SourceString = &DeviceExtension->HardwareIds; + break; + + case BusQueryCompatibleIDs: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + SourceString = &DeviceExtension->CompatibleIds; + break; + + case BusQueryInstanceID: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + SourceString = &DeviceExtension->InstanceId; + break; + + default: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", + IrpSp->Parameters.QueryId.IdType); + ASSERT(FALSE); + return STATUS_NOT_SUPPORTED; + } + + Status = DuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + SourceString, + &String); + + *Information = (ULONG_PTR)String.Buffer; + + return Status; +} + + NTSTATUS NTAPI FdcPdoPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status = STATUS_NOT_SUPPORTED; + PIO_STACK_LOCATION IrpSp; + ULONG_PTR Information = 0; + NTSTATUS Status; + DPRINT1("FdcPdoPnp()\n"); + + Status = Irp->IoStatus.Status; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_DEVICE_USAGE_NOTIFICATION: + DPRINT1("Unimplemented IRP_MN_DEVICE_USAGE_NOTIFICATION received\n"); + break; + + case IRP_MN_EJECT: + DPRINT1("Unimplemented IRP_MN_EJECT received\n"); + break; + + case IRP_MN_QUERY_BUS_INFORMATION: + DPRINT1("IRP_MN_QUERY_BUS_INFORMATION received\n"); + break; + + case IRP_MN_QUERY_CAPABILITIES: + DPRINT1("IRP_MN_QUERY_CAPABILITIES received\n"); + Status = FdcPdoQueryCapabilities(DeviceObject, IrpSp); + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS received\n"); + break; + + case IRP_MN_QUERY_DEVICE_TEXT: + DPRINT1("IRP_MN_QUERY_DEVICE_TEXT received\n"); + break; + + case IRP_MN_QUERY_ID: + DPRINT1("IRP_MN_QUERY_ID received\n"); + Status = FdcPdoQueryId(DeviceObject, IrpSp, &Information); + break; + + case IRP_MN_QUERY_PNP_DEVICE_STATE: + DPRINT1("Unimplemented IRP_MN_QUERY_ID received\n"); + break; + + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS received\n"); + break; + + case IRP_MN_QUERY_RESOURCES: + DPRINT1("IRP_MN_QUERY_RESOURCES received\n"); + break; + + case IRP_MN_SET_LOCK: + DPRINT1("Unimplemented IRP_MN_SET_LOCK received\n"); + break; + + case IRP_MN_START_DEVICE: + DPRINT1("IRP_MN_START_DEVICE received\n"); + break; + + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + Status = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + DPRINT1("IRP_MN_REMOVE_DEVICE received\n"); + break; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + DPRINT1("IRP_MN_FILTER_RESOURCE_REQUIREMENTS received\n"); + /* Nothing to do */ + Irp->IoStatus.Status = Status; + break; + + default: + DPRINT1("Unknown IOCTL 0x%lx\n", IrpSp->MinorFunction); + break; + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + DPRINT1("Leaving. Status 0x%X\n", Status); + return Status; }

1 0

[akhaldi] 61152: [SHELLEXTS] * Forgot to commit these in r61130. CORE-7637
by akhaldi＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: akhaldi Date: Sat Nov 30 08:40:31 2013 New Revision: 61152 URL: http://svn.reactos.org/svn/reactos?rev=61152&view=rev Log: [SHELLEXTS] * Forgot to commit these in r61130. CORE-7637 Removed: trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/fontext/rsrc.rc trunk/reactos/dll/shellext/slayer/rsrc.rc Removed: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/rsrc.rc (removed) @@ -1,54 +0,0 @@ -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_EU_ES - #include "lang/eu-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif - -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif Removed: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/rsrc.rc (removed) @@ -1,54 +0,0 @@ -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_EU_ES - #include "lang/eu-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif - -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif Removed: trunk/reactos/dll/shellext/fontext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/rsrc.… ============================================================================== --- trunk/reactos/dll/shellext/fontext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/rsrc.rc (removed) @@ -1,3 +0,0 @@ -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif Removed: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… ============================================================================== --- trunk/reactos/dll/shellext/slayer/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/rsrc.rc (removed) @@ -1,63 +0,0 @@ -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_EU_ES - #include "lang/eu-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HU_HU - #include "lang/hu-HU.rc" -#endif -#ifdef LANGUAGE_ID_ID - #include "lang/id-ID.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_NL_NL - #include "lang/nl-NL.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif - -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif

1 0

[aandrejevic] 61151: [NTVDM] Fix the PIT square wave generator.
by aandrejevic＠svn.reactos.org 30 Nov '13

30 Nov '13

Author: aandrejevic Date: Sat Nov 30 03:59:26 2013 New Revision: 61151 URL: http://svn.reactos.org/svn/reactos?rev=61151&view=rev Log: [NTVDM] Fix the PIT square wave generator. Modified: branches/ntvdm/subsystems/ntvdm/timer.c Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Sat Nov 30 03:59:26 2013 @@ -277,11 +277,11 @@ } else { + /* Decrease the value */ + PitChannels[i].CurrentValue -= Count * 2; + /* Clear the count */ Count = 0; - - /* Decrease the value */ - PitChannels[i].CurrentValue -= Count * 2; /* Did it fall to zero? */ if (PitChannels[i].CurrentValue == 0) @@ -304,7 +304,9 @@ } /* Was there any rising edge on channel 0 ? */ - if ((PitChannels[i].OutputFlipFlop || ReloadCount) && (i == 0)) + if (((PitChannels[i].OutputFlipFlop && (ReloadCount == 1)) + || (ReloadCount > 1)) + && (i == 0)) { /* Yes, IRQ 0 */ PicInterruptRequest(0);

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 November 2013