Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[tkreuzer] 64260: [WIN32K] - Implement REGION_SubtractRectFromRgn - Rewrite NtGdiExcludeClipRect, fixing a number of gdi32 apitests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Sep 24 21:23:03 2014 New Revision: 64260 URL: http://svn.reactos.org/svn/reactos?rev=64260&view=rev Log: [WIN32K] - Implement REGION_SubtractRectFromRgn - Rewrite NtGdiExcludeClipRect, fixing a number of gdi32 apitests Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -190,55 +190,79 @@ return iComplexity; } -int APIENTRY NtGdiExcludeClipRect(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect) -{ - INT Result; - RECTL Rect; - PREGION prgnNew; - PDC dc = DC_LockDc(hDC); - - if (!dc) +INT +APIENTRY +NtGdiExcludeClipRect( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + INT iComplexity; + RECTL rect; + PDC pdc; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return ERROR; } - Rect.left = LeftRect; - Rect.top = TopRect; - Rect.right = RightRect; - Rect.bottom = BottomRect; - - IntLPtoDP(dc, (LPPOINT)&Rect, 2); - - prgnNew = IntSysCreateRectpRgnIndirect(&Rect); - if (!prgnNew) - { - Result = ERROR; - } - else - { - if (!dc->dclevel.prgnClip) - { - dc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); - IntGdiCombineRgn(dc->dclevel.prgnClip, dc->prgnVis, prgnNew, RGN_DIFF); - Result = SIMPLEREGION; + /* Convert coordinates to device space */ + rect.left = xLeft; + rect.top = yTop; + rect.right = xRight; + rect.bottom = yBottom; + RECTL_vMakeWellOrdered(&rect); + IntLPtoDP(pdc, (LPPOINT)&rect, 2); + + /* Check if we already have a clip region */ + if (pdc->dclevel.prgnClip != NULL) + { + /* We have a region, subtract the rect */ + iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, + pdc->dclevel.prgnClip, + &rect); + + /* Emulate Windows behavior */ + if (iComplexity == SIMPLEREGION) + iComplexity = COMPLEXREGION; + } + else + { + /* Check if the rect intersects with the window rect */ + if (RECTL_bIntersectRect(&rect, &rect, &pdc->erclWindow)) + { + /* It does. In this case create an empty region */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + iComplexity = NULLREGION; } else { - Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgnNew, RGN_DIFF); - } - REGION_Delete(prgnNew); - } - if (Result != ERROR) - dc->fs |= DC_FLAG_DIRTY_RAO; - - DC_UnlockDc(dc); - - return Result; + /* Otherwise, emulate strange Windows behavior... */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 1, 1); + iComplexity = COMPLEXREGION; + } + + /* Check if creating the region failed */ + if (pdc->dclevel.prgnClip == NULL) + { + /* Return error code */ + iComplexity = ERROR; + } + } + + /* If we succeeded, mark the RAO region as dirty */ + if (iComplexity != ERROR) + pdc->fs |= DC_FLAG_DIRTY_RAO; + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + return iComplexity; } INT Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -1773,6 +1773,23 @@ REGION_UnionRegion(rgn, rgn, &region); } +INT +FASTCALL +REGION_SubtractRectFromRgn( + PREGION prgnDest, + PREGION prgnSrc, + const RECTL *prcl) +{ + REGION rgnLocal; + + rgnLocal.Buffer = &rgnLocal.rdh.rcBound; + rgnLocal.rdh.nCount = 1; + rgnLocal.rdh.nRgnSize = sizeof(RECT); + rgnLocal.rdh.rcBound = *prcl; + REGION_SubtractRegion(prgnDest, prgnSrc, &rgnLocal); + return REGION_Complexity(prgnDest); +} + BOOL FASTCALL REGION_CreateSimpleFrameRgn( PROSRGNDATA rgn, Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -25,6 +25,7 @@ PROSRGNDATA FASTCALL REGION_AllocRgnWithHandle(INT n); PROSRGNDATA FASTCALL REGION_AllocUserRgnWithHandle(INT n); VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, const RECTL *rect); +INT FASTCALL REGION_SubtractRectFromRgn(PREGION prgnDest, PREGION prgnSrc, const RECTL *prcl); INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT);

9 years, 12 months

[tfaber] 64259: [EVENTVWR][TELNET][USETUP] - Remove dead code. Patch by Kudratov Olimjon. CORE-8545

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Sep 24 21:05:29 2014 New Revision: 64259 URL: http://svn.reactos.org/svn/reactos?rev=64259&view=rev Log: [EVENTVWR][TELNET][USETUP] - Remove dead code. Patch by Kudratov Olimjon. CORE-8545 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -798,7 +798,6 @@ case IDCANCEL: { return FALSE; - break; } case IDNO: Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -426,7 +426,6 @@ Charmap.modmap(bHost, 'B', bConsole); }; return (Charmap.enabled = 1); - return 1; }; // AVS Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -930,17 +930,14 @@ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return INSTALL_INTRO_PAGE; - break; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { return REPAIR_INTRO_PAGE; - break; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* R */ { return LICENSE_PAGE; - break; } } @@ -965,7 +962,6 @@ if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return INTRO_PAGE; - break; } }

9 years, 12 months

[tfaber] 64258: [WINED3D] - Use correct FXCAPS constant in wined3d_get_device_caps. Spotted by Kudratov Olimjon. CORE-8545

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Sep 24 20:58:00 2014 New Revision: 64258 URL: http://svn.reactos.org/svn/reactos?rev=64258&view=rev Log: [WINED3D] - Use correct FXCAPS constant in wined3d_get_device_caps. Spotted by Kudratov Olimjon. CORE-8545 Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Wed Sep 24 20:58:00 2014 @@ -4614,7 +4614,7 @@ WINEDDFXCAPS_BLTSHRINKX | WINEDDFXCAPS_BLTSHRINKXN | WINEDDFXCAPS_BLTSHRINKY | - WINEDDFXCAPS_BLTSHRINKXN | + WINEDDFXCAPS_BLTSHRINKYN | WINEDDFXCAPS_BLTSTRETCHX | WINEDDFXCAPS_BLTSTRETCHXN | WINEDDFXCAPS_BLTSTRETCHY |

9 years, 12 months

[akhaldi] 64257: * Sync up to trunk head (r64256).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Sep 24 20:09:20 2014 New Revision: 64257 URL: http://svn.reactos.org/svn/reactos?rev=64257&view=rev Log: * Sync up to trunk head (r64256). Added: branches/TransitionPte/dll/win32/fltlib/ - copied from r64245, trunk/reactos/dll/win32/fltlib/ branches/TransitionPte/dll/win32/mspatcha/ - copied from r64256, trunk/reactos/dll/win32/mspatcha/ branches/TransitionPte/include/psdk/patchapi.h - copied unchanged from r64256, trunk/reactos/include/psdk/patchapi.h Modified: branches/TransitionPte/ (props changed) branches/TransitionPte/CMakeLists.txt branches/TransitionPte/boot/bootdata/hivesft.inf branches/TransitionPte/cmake/gcc.cmake branches/TransitionPte/dll/directx/wine/d3d8/buffer.c branches/TransitionPte/dll/directx/wine/d3d8/d3d8_main.c branches/TransitionPte/dll/directx/wine/d3d8/d3d8_private.h branches/TransitionPte/dll/directx/wine/d3d8/device.c branches/TransitionPte/dll/directx/wine/d3d8/surface.c branches/TransitionPte/dll/directx/wine/d3d8/swapchain.c branches/TransitionPte/dll/directx/wine/d3d8/texture.c branches/TransitionPte/dll/directx/wine/d3d8/volume.c branches/TransitionPte/dll/directx/wine/d3d9/buffer.c branches/TransitionPte/dll/directx/wine/d3d9/d3d9_main.c branches/TransitionPte/dll/directx/wine/d3d9/d3d9_private.h branches/TransitionPte/dll/directx/wine/d3d9/device.c branches/TransitionPte/dll/directx/wine/d3d9/query.c branches/TransitionPte/dll/directx/wine/d3d9/surface.c branches/TransitionPte/dll/directx/wine/d3d9/swapchain.c branches/TransitionPte/dll/directx/wine/d3d9/texture.c branches/TransitionPte/dll/directx/wine/d3d9/volume.c branches/TransitionPte/dll/directx/wine/ddraw/ddraw.c branches/TransitionPte/dll/directx/wine/ddraw/ddraw_private.h branches/TransitionPte/dll/directx/wine/ddraw/device.c branches/TransitionPte/dll/directx/wine/ddraw/executebuffer.c branches/TransitionPte/dll/directx/wine/ddraw/palette.c branches/TransitionPte/dll/directx/wine/ddraw/surface.c branches/TransitionPte/dll/directx/wine/ddraw/utils.c branches/TransitionPte/dll/directx/wine/ddraw/vertexbuffer.c branches/TransitionPte/dll/directx/wine/ddraw/viewport.c branches/TransitionPte/dll/directx/wine/wined3d/arb_program_shader.c branches/TransitionPte/dll/directx/wine/wined3d/buffer.c branches/TransitionPte/dll/directx/wine/wined3d/context.c branches/TransitionPte/dll/directx/wine/wined3d/cs.c branches/TransitionPte/dll/directx/wine/wined3d/device.c branches/TransitionPte/dll/directx/wine/wined3d/directx.c branches/TransitionPte/dll/directx/wine/wined3d/drawprim.c branches/TransitionPte/dll/directx/wine/wined3d/glsl_shader.c branches/TransitionPte/dll/directx/wine/wined3d/palette.c branches/TransitionPte/dll/directx/wine/wined3d/query.c branches/TransitionPte/dll/directx/wine/wined3d/resource.c branches/TransitionPte/dll/directx/wine/wined3d/shader.c branches/TransitionPte/dll/directx/wine/wined3d/shader_sm4.c branches/TransitionPte/dll/directx/wine/wined3d/state.c branches/TransitionPte/dll/directx/wine/wined3d/stateblock.c branches/TransitionPte/dll/directx/wine/wined3d/surface.c branches/TransitionPte/dll/directx/wine/wined3d/swapchain.c branches/TransitionPte/dll/directx/wine/wined3d/texture.c branches/TransitionPte/dll/directx/wine/wined3d/utils.c branches/TransitionPte/dll/directx/wine/wined3d/view.c branches/TransitionPte/dll/directx/wine/wined3d/volume.c branches/TransitionPte/dll/directx/wine/wined3d/wined3d.spec branches/TransitionPte/dll/directx/wine/wined3d/wined3d_gl.h branches/TransitionPte/dll/directx/wine/wined3d/wined3d_main.c branches/TransitionPte/dll/directx/wine/wined3d/wined3d_private.h branches/TransitionPte/dll/ntdll/ldr/ldrutils.c branches/TransitionPte/dll/win32/CMakeLists.txt branches/TransitionPte/dll/win32/advapi32/service/sctrl.c branches/TransitionPte/dll/win32/msi/action.c branches/TransitionPte/dll/win32/msi/appsearch.c branches/TransitionPte/dll/win32/msi/classes.c branches/TransitionPte/dll/win32/msi/cond.tab.c branches/TransitionPte/dll/win32/msi/files.c branches/TransitionPte/dll/win32/msi/msi.c branches/TransitionPte/dll/win32/msi/msi.spec branches/TransitionPte/dll/win32/msi/package.c branches/TransitionPte/dll/win32/msi/patch.c branches/TransitionPte/dll/win32/msi/sql.tab.c branches/TransitionPte/dll/win32/msi/sql.tab.h branches/TransitionPte/dll/win32/msi/table.c branches/TransitionPte/drivers/crypto/ksecdd/random.c branches/TransitionPte/drivers/filesystems/ntfs/attrib.c branches/TransitionPte/drivers/filesystems/ntfs/ntfs.h branches/TransitionPte/include/ndk/i386/asm.h branches/TransitionPte/include/ndk/rtltypes.h branches/TransitionPte/include/psdk/d3d8.h branches/TransitionPte/include/psdk/d3d8types.h branches/TransitionPte/include/psdk/d3d9.h branches/TransitionPte/include/psdk/d3d9types.h branches/TransitionPte/include/psdk/msiquery.h branches/TransitionPte/include/reactos/wine/wined3d.h branches/TransitionPte/media/doc/README.WINE branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c branches/TransitionPte/subsystems/ntvdm/bios/vidbios.c branches/TransitionPte/subsystems/ntvdm/hardware/speaker.c branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.c branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.h branches/TransitionPte/win32ss/gdi/ntgdi/coord.c branches/TransitionPte/win32ss/gdi/ntgdi/dc.h branches/TransitionPte/win32ss/gdi/ntgdi/gdidebug.h branches/TransitionPte/win32ss/gdi/ntgdi/region.c branches/TransitionPte/win32ss/gdi/ntgdi/region.h branches/TransitionPte/win32ss/user/ntuser/callback.c branches/TransitionPte/win32ss/user/ntuser/vis.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/TransitionPte/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/CMakeLists.txt?re… Modified: branches/TransitionPte/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/boot/bootdata/hiv… Modified: branches/TransitionPte/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/cmake/gcc.cmake?r… Modified: branches/TransitionPte/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/ntdll/ldr/ldr… Modified: branches/TransitionPte/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/CMakeLi… Modified: branches/TransitionPte/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/advapi3… Modified: branches/TransitionPte/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/act… Modified: branches/TransitionPte/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/app… Modified: branches/TransitionPte/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/cla… Modified: branches/TransitionPte/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/con… Modified: branches/TransitionPte/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/fil… Modified: branches/TransitionPte/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/msi… Modified: branches/TransitionPte/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/msi… Modified: branches/TransitionPte/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/pac… Modified: branches/TransitionPte/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/pat… Modified: branches/TransitionPte/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/sql… Modified: branches/TransitionPte/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/sql… Modified: branches/TransitionPte/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/tab… Modified: branches/TransitionPte/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/crypto/ks… Modified: branches/TransitionPte/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… Modified: branches/TransitionPte/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… Modified: branches/TransitionPte/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/i386/… Modified: branches/TransitionPte/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/rtlty… Modified: branches/TransitionPte/include/psdk/d3d8.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d8… Modified: branches/TransitionPte/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d8… Modified: branches/TransitionPte/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d9… Modified: branches/TransitionPte/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d9… Modified: branches/TransitionPte/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/msiq… Modified: branches/TransitionPte/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/reactos/w… Modified: branches/TransitionPte/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/media/doc/README.… Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… Modified: branches/TransitionPte/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/subsystems/ntvdm/… Modified: branches/TransitionPte/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/subsystems/ntvdm/… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/user/ntus… Modified: branches/TransitionPte/win32ss/user/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/user/ntus…

9 years, 12 months

[ion] 64256: [NDK]: A few minor updates.

by ion＠svn.reactos.org

Author: ion Date: Wed Sep 24 16:00:35 2014 New Revision: 64256 URL: http://svn.reactos.org/svn/reactos?rev=64256&view=rev Log: [NDK]: A few minor updates. Modified: trunk/reactos/include/ndk/i386/asm.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Wed Sep 24 16:00:35 2014 @@ -476,6 +476,7 @@ #define EFLAGS_VIP 0x100000 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_ID 0x200000 #define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) #endif #define EFLAGS_USER_SANITIZE 0x3F4DD7 Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Sep 24 16:00:35 2014 @@ -74,6 +74,7 @@ // // Flags in RTL_ACTIVATION_CONTEXT_STACK_FRAME (from Checked NTDLL) // +#define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_RELEASE_ON_DEACTIVATION 0x01 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_NO_DEACTIVATE 0x02 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ON_FREE_LIST 0x04 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_HEAP_ALLOCATED 0x08 @@ -884,6 +885,13 @@ typedef RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; typedef PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; +typedef struct _RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME +{ + RTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; + ULONG_PTR Cookie; + PVOID ActivationStackBackTrace[8]; +} RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME, *PRTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; + #if (NTDDI_VERSION >= NTDDI_WS03) typedef struct _ACTIVATION_CONTEXT_STACK { @@ -914,6 +922,16 @@ ULONG AssemblyRosterOffset; ULONG Flags; } ACTIVATION_CONTEXT_DATA, *PACTIVATION_CONTEXT_DATA; + +typedef struct _ACTIVATION_CONTEXT_STACK_FRAMELIST +{ + ULONG Magic; + ULONG FramesInUse; + LIST_ENTRY Links; + ULONG Flags; + ULONG NotFramesInUse; + RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME Frames[32]; +} ACTIVATION_CONTEXT_STACK_FRAMELIST, *PACTIVATION_CONTEXT_STACK_FRAMELIST; #endif /* NTOS_MODE_USER */

9 years, 12 months

[jgardou] 64255: [NDK] - Rename MM_PAGE_FRAME_NUMBER_SIZE into MM_VPN_BITS_SIZE on a suggestion from Timo

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Sep 24 10:11:51 2014 New Revision: 64255 URL: http://svn.reactos.org/svn/reactos?rev=64255&view=rev Log: [NDK] - Rename MM_PAGE_FRAME_NUMBER_SIZE into MM_VPN_BITS_SIZE on a suggestion from Timo Modified: branches/TransitionPte/include/ndk/amd64/mmtypes.h branches/TransitionPte/include/ndk/arm/mmtypes.h branches/TransitionPte/include/ndk/i386/mmtypes.h branches/TransitionPte/include/ndk/mmtypes.h Modified: branches/TransitionPte/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/amd64… ============================================================================== --- branches/TransitionPte/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/amd64/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -35,7 +35,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 52 +#define MM_VPN_BITS_SIZE 52 // // Address of the shared user page Modified: branches/TransitionPte/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/arm/m… ============================================================================== --- branches/TransitionPte/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -36,7 +36,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 20 +#define MM_VPN_BITS_SIZE 20 // // Sanity checks for Paging Macros Modified: branches/TransitionPte/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/i386/… ============================================================================== --- branches/TransitionPte/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/i386/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -34,7 +34,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 20 +#define MM_VPN_BITS_SIZE 20 // // Address of the shared user page Modified: branches/TransitionPte/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/mmtyp… ============================================================================== --- branches/TransitionPte/include/ndk/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -850,7 +850,7 @@ ULONG_PTR Hashed:1; ULONG_PTR Direct:1; ULONG_PTR Age:2; - ULONG_PTR VirtualPageNumber: MM_PAGE_FRAME_NUMBER_SIZE; + ULONG_PTR VirtualPageNumber: MM_VPN_BITS_SIZE; } MMWSLENTRY, *PMMWSLENTRY; typedef struct _MMWSLE

9 years, 12 months

[tkreuzer] 64254: [GDI32_APITEST] Add tests for ExcludeClipRect, convert tabs to spaces

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Sep 24 08:35:30 2014 New Revision: 64254 URL: http://svn.reactos.org/svn/reactos?rev=64254&view=rev Log: [GDI32_APITEST] Add tests for ExcludeClipRect, convert tabs to spaces Added: trunk/rostests/apitests/gdi32/ExcludeClipRect.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/GetClipBox.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -22,6 +22,7 @@ EngCreateSemaphore.c EngDeleteSemaphore.c EngReleaseSemaphore.c + ExcludeClipRect.c ExtCreatePen.c GdiConvertBitmap.c GdiConvertBrush.c Added: trunk/rostests/apitests/gdi32/ExcludeClipRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExcludeCli… ============================================================================== --- trunk/rostests/apitests/gdi32/ExcludeClipRect.c (added) +++ trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ExcludeClipRect + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#define CLIPRGN 1 + +#define ok_rect(_prc, _left, _top, _right, _bottom) \ + ok_int((_prc)->left, _left); \ + ok_int((_prc)->top, _top); \ + ok_int((_prc)->right, _right); \ + ok_int((_prc)->bottom, _bottom); \ + +void Test_ExcludeClipRect() +{ + HDC hdc; + HRGN hrgn, hrgn2; + + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "CreateCompatibleDC failed, skipping tests.\n"); + if (!hdc) return; + + hrgn2 = CreateRectRgn(0, 0, 0, 0); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(ExcludeClipRect(NULL, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(ExcludeClipRect((HDC)(ULONG_PTR)0x12345, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + SetLastError(0x12345); + + /* Set a clip region */ + hrgn = CreateRectRgn(10, 10, 20, 30); + ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); // yeah... it's NULLREGION + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); // but in fact it's a rect region! + + /* Exclude something outside of the clip region */ + ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), COMPLEXREGION); // in reality it's a rect region + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Now exclude something for real */ + ok_int(ExcludeClipRect(hdc, 0, 0, 15, 15), COMPLEXREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), COMPLEXREGION); + + /* Exclude everything left */ + ok_int(ExcludeClipRect(hdc, 0, 0, 100, 100), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); + + /* Reset the clip region */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); // makes sense, it's actually the whole region + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 0); // return value says region is NULL + ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); // but now we have a region + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); // but it's a NULLREGION (aka empty)? + + /* Test negative rect */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, -10, -10, 0, 0), COMPLEXREGION); // this time it's a complex region? + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 1, 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Test rect with high coordinates */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, 100000, 100000, 100010, 100010), COMPLEXREGION); // this time it's a complex region? + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 1, 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Test reversed rect negative, but still above 0 */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, 1, 1, -10, -20), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 0, 0); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); + + ok_int(GetLastError(), 0x12345); + +} + + +START_TEST(ExcludeClipRect) +{ + Test_ExcludeClipRect(); +} Propchange: trunk/rostests/apitests/gdi32/ExcludeClipRect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/GetClipBox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipBox… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -18,117 +18,117 @@ void Test_GetClipBox() { - HWND hWnd; - HDC hdc; - RECT rect; - HRGN hrgn, hrgn2; - int ret; + HWND hWnd; + HDC hdc; + RECT rect; + HRGN hrgn, hrgn2; + int ret; - /* Create a window */ - hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, - NULL, NULL, 0, 0); + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); ok(hWnd != NULL, "CreateWindowW failed\n"); if (hWnd == NULL) { return; } - hdc = GetDC(hWnd); + hdc = GetDC(hWnd); - /* Test invalid DC */ - SetLastError(ERROR_SUCCESS); - ret = GetClipBox((HDC)0x12345, &rect); - ok(ret == ERROR, "Expected ERROR, got %d\n", ret); - ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + ret = GetClipBox((HDC)0x12345, &rect); + ok(ret == ERROR, "Expected ERROR, got %d\n", ret); + ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); - //ret = GetClipBox(hdc, &rect); - //ok_int(ret, SIMPLEREGION); - //ok_rect(&rect, 0, 0, 132, 68); + //ret = GetClipBox(hdc, &rect); + //ok_int(ret, SIMPLEREGION); + //ok_rect(&rect, 0, 0, 132, 68); /* Create a clip region */ - hrgn = CreateRectRgn(5, 7, 50, 50); + hrgn = CreateRectRgn(5, 7, 50, 50); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 5, 7, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 5, 7, 50, 50); /* Set clip region as meta region */ SetMetaRgn(hdc); /* Create a new clip region */ - hrgn = CreateRectRgn(10, 10, 100, 100); + hrgn = CreateRectRgn(10, 10, 100, 100); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Create an empty clip region */ - hrgn = CreateRectRgn(10, 10, 10, 30); + hrgn = CreateRectRgn(10, 10, 10, 30); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, NULLREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, NULLREGION); + ok_rect(&rect, 0, 0, 0, 0); /* Create a complex region */ - hrgn = CreateRectRgn(10, 10, 30, 30); - hrgn2 = CreateRectRgn(20, 20, 60, 60); - ok_int(CombineRgn(hrgn, hrgn, hrgn2, RGN_OR), COMPLEXREGION); + hrgn = CreateRectRgn(10, 10, 30, 30); + hrgn2 = CreateRectRgn(20, 20, 60, 60); + ok_int(CombineRgn(hrgn, hrgn, hrgn2, RGN_OR), COMPLEXREGION); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn2); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Set scaling but keep the mapping mode (viewport should not be changed) */ ok_int(SetViewportExtEx(hdc, 1000, 1000, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Set unisotropic mode, ClipBox should be unchanged */ ok_int(SetMapMode(hdc, MM_ANISOTROPIC), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Now set viewport again */ ok_int(SetViewportExtEx(hdc, 200, 400, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); // obviously some special secret feature... - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); // obviously some special secret feature... + ok_rect(&rect, 0, 0, 0, 0); /* Reset clip region */ SelectClipRgn(hdc, NULL); SetMetaRgn(hdc); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); - hrgn = CreateRectRgn(10, 10, 190, 190); + hrgn = CreateRectRgn(10, 10, 190, 190); SelectClipRgn(hdc, hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); /* Now also set the window extension */ ok_int(SetWindowExtEx(hdc, 400, 600, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 20, 15, 100, 75); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 20, 15, 100, 75); - hrgn = CreateRectRgn(30, 30, 300, 300); + hrgn = CreateRectRgn(30, 30, 300, 300); SelectClipRgn(hdc, hrgn); SetMetaRgn(hdc); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 60, 45, 100, 75); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 60, 45, 100, 75); - ReleaseDC(hWnd, hdc); - DestroyWindow(hWnd); + ReleaseDC(hWnd, hdc); + DestroyWindow(hWnd); } START_TEST(GetClipBox) Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -23,6 +23,7 @@ extern void func_EngCreateSemaphore(void); extern void func_EngDeleteSemaphore(void); extern void func_EngReleaseSemaphore(void); +extern void func_ExcludeClipRect(void); extern void func_ExtCreatePen(void); extern void func_GdiConvertBitmap(void); extern void func_GdiConvertBrush(void); @@ -83,6 +84,7 @@ { "EngCreateSemaphore", func_EngCreateSemaphore }, { "EngDeleteSemaphore", func_EngDeleteSemaphore }, { "EngReleaseSemaphore", func_EngReleaseSemaphore }, + { "ExcludeClipRect", func_ExcludeClipRect }, { "ExtCreatePen", func_ExtCreatePen }, { "GdiConvertBitmap", func_GdiConvertBitmap }, { "GdiConvertBrush", func_GdiConvertBrush },

9 years, 12 months

[jgardou] 64253: [WIN32K] - Add a debug print to help, well..., debugging.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Sep 23 23:28:22 2014 New Revision: 64253 URL: http://svn.reactos.org/svn/reactos?rev=64253&view=rev Log: [WIN32K] - Add a debug print to help, well..., debugging. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Tue Sep 23 23:28:22 2014 @@ -295,6 +295,9 @@ ULONG ResultLength; ULONG ArgumentLength; LRESULT Result; + + TRACE("co_IntCallWindowProc(Proc %p, IsAnsiProc: %s, Wnd %p, Message %u, wParam %Iu, lParam %Id, lParamBufferSize %d)\n", + Proc, IsAnsiProc ? "TRUE" : "FALSE", Wnd, Message, wParam, lParam, lParamBufferSize); /* Do not allow the desktop thread to do callback to user mode */ ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread);

9 years, 12 months

[jgardou] 64252: [HIVESFT] - Add the AddTrust Certificate root. Now Oracle servers can be reached with SSL.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Sep 23 23:28:08 2014 New Revision: 64252 URL: http://svn.reactos.org/svn/reactos?rev=64252&view=rev Log: [HIVESFT] - Add the AddTrust Certificate root. Now Oracle servers can be reached with SSL. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Sep 23 23:28:08 2014 @@ -420,6 +420,78 @@ 0xB6,0xF7,0x82,0x5F,0x85,0xD2,0x41,0x18,0xDB,0x81,0xB3,0x04,0x1C,0xC5,0x1F,0xA4,\ 0x80,0x6F,0x15,0x20,0xC9,0xDE,0x0C,0x88,0x0A,0x1D,0xD6,0x66,0x55,0xE2,0xFC,0x48,\ 0xC9,0x29,0x26,0x69,0xE0 + +; AddTrust External CA Root +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\02FAF3E291435468607857694DF5E45B68851868","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x3A,0x04,0x00,0x00,0x30,0x82,0x04,0x36,\ + 0x30,0x82,0x03,0x1E,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,0x30,0x0D,0x06,0x09,\ + 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x6F,0x31,0x0B,0x30,\ + 0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,0x12,0x06,0x03,\ + 0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x41,0x42,\ + 0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,0x64,0x54,0x72,\ + 0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x54,0x54,0x50,\ + 0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,0x03,0x55,0x04,\ + 0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,\ + 0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x30,0x1E,0x17,0x0D,\ + 0x30,0x30,0x30,0x35,0x33,0x30,0x31,0x30,0x34,0x38,0x33,0x38,0x5A,0x17,0x0D,0x32,\ + 0x30,0x30,0x35,0x33,0x30,0x31,0x30,0x34,0x38,0x33,0x38,0x5A,0x30,0x6F,0x31,0x0B,\ + 0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,0x12,0x06,\ + 0x03,0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x41,\ + 0x42,0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,0x64,0x54,\ + 0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x54,0x54,\ + 0x50,0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,0x03,0x55,\ + 0x04,0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,\ + 0x65,0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x30,0x82,0x01,\ + 0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,\ + 0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xB7,0xF7,\ + 0x1A,0x33,0xE6,0xF2,0x00,0x04,0x2D,0x39,0xE0,0x4E,0x5B,0xED,0x1F,0xBC,0x6C,0x0F,\ + 0xCD,0xB5,0xFA,0x23,0xB6,0xCE,0xDE,0x9B,0x11,0x33,0x97,0xA4,0x29,0x4C,0x7D,0x93,\ + 0x9F,0xBD,0x4A,0xBC,0x93,0xED,0x03,0x1A,0xE3,0x8F,0xCF,0xE5,0x6D,0x50,0x5A,0xD6,\ + 0x97,0x29,0x94,0x5A,0x80,0xB0,0x49,0x7A,0xDB,0x2E,0x95,0xFD,0xB8,0xCA,0xBF,0x37,\ + 0x38,0x2D,0x1E,0x3E,0x91,0x41,0xAD,0x70,0x56,0xC7,0xF0,0x4F,0x3F,0xE8,0x32,0x9E,\ + 0x74,0xCA,0xC8,0x90,0x54,0xE9,0xC6,0x5F,0x0F,0x78,0x9D,0x9A,0x40,0x3C,0x0E,0xAC,\ + 0x61,0xAA,0x5E,0x14,0x8F,0x9E,0x87,0xA1,0x6A,0x50,0xDC,0xD7,0x9A,0x4E,0xAF,0x05,\ + 0xB3,0xA6,0x71,0x94,0x9C,0x71,0xB3,0x50,0x60,0x0A,0xC7,0x13,0x9D,0x38,0x07,0x86,\ + 0x02,0xA8,0xE9,0xA8,0x69,0x26,0x18,0x90,0xAB,0x4C,0xB0,0x4F,0x23,0xAB,0x3A,0x4F,\ + 0x84,0xD8,0xDF,0xCE,0x9F,0xE1,0x69,0x6F,0xBB,0xD7,0x42,0xD7,0x6B,0x44,0xE4,0xC7,\ + 0xAD,0xEE,0x6D,0x41,0x5F,0x72,0x5A,0x71,0x08,0x37,0xB3,0x79,0x65,0xA4,0x59,0xA0,\ + 0x94,0x37,0xF7,0x00,0x2F,0x0D,0xC2,0x92,0x72,0xDA,0xD0,0x38,0x72,0xDB,0x14,0xA8,\ + 0x45,0xC4,0x5D,0x2A,0x7D,0xB7,0xB4,0xD6,0xC4,0xEE,0xAC,0xCD,0x13,0x44,0xB7,0xC9,\ + 0x2B,0xDD,0x43,0x00,0x25,0xFA,0x61,0xB9,0x69,0x6A,0x58,0x23,0x11,0xB7,0xA7,0x33,\ + 0x8F,0x56,0x75,0x59,0xF5,0xCD,0x29,0xD7,0x46,0xB7,0x0A,0x2B,0x65,0xB6,0xD3,0x42,\ + 0x6F,0x15,0xB2,0xB8,0x7B,0xFB,0xEF,0xE9,0x5D,0x53,0xD5,0x34,0x5A,0x27,0x02,0x03,\ + 0x01,0x00,0x01,0xA3,0x81,0xDC,0x30,0x81,0xD9,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,\ + 0x04,0x16,0x04,0x14,0xAD,0xBD,0x98,0x7A,0x34,0xB4,0x26,0xF7,0xFA,0xC4,0x26,0x54,\ + 0xEF,0x03,0xBD,0xE0,0x24,0xCB,0x54,0x1A,0x30,0x0B,0x06,0x03,0x55,0x1D,0x0F,0x04,\ + 0x04,0x03,0x02,0x01,0x06,0x30,0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,\ + 0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x81,0x99,0x06,0x03,0x55,0x1D,0x23,0x04,0x81,\ + 0x91,0x30,0x81,0x8E,0x80,0x14,0xAD,0xBD,0x98,0x7A,0x34,0xB4,0x26,0xF7,0xFA,0xC4,\ + 0x26,0x54,0xEF,0x03,0xBD,0xE0,0x24,0xCB,0x54,0x1A,0xA1,0x73,0xA4,0x71,0x30,0x6F,\ + 0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,\ + 0x12,0x06,0x03,0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,\ + 0x20,0x41,0x42,0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,\ + 0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,\ + 0x54,0x54,0x50,0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,\ + 0x03,0x55,0x04,0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,\ + 0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x82,\ + 0x01,0x01,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,\ + 0x00,0x03,0x82,0x01,0x01,0x00,0xB0,0x9B,0xE0,0x85,0x25,0xC2,0xD6,0x23,0xE2,0x0F,\ + 0x96,0x06,0x92,0x9D,0x41,0x98,0x9C,0xD9,0x84,0x79,0x81,0xD9,0x1E,0x5B,0x14,0x07,\ + 0x23,0x36,0x65,0x8F,0xB0,0xD8,0x77,0xBB,0xAC,0x41,0x6C,0x47,0x60,0x83,0x51,0xB0,\ + 0xF9,0x32,0x3D,0xE7,0xFC,0xF6,0x26,0x13,0xC7,0x80,0x16,0xA5,0xBF,0x5A,0xFC,0x87,\ + 0xCF,0x78,0x79,0x89,0x21,0x9A,0xE2,0x4C,0x07,0x0A,0x86,0x35,0xBC,0xF2,0xDE,0x51,\ + 0xC4,0xD2,0x96,0xB7,0xDC,0x7E,0x4E,0xEE,0x70,0xFD,0x1C,0x39,0xEB,0x0C,0x02,0x51,\ + 0x14,0x2D,0x8E,0xBD,0x16,0xE0,0xC1,0xDF,0x46,0x75,0xE7,0x24,0xAD,0xEC,0xF4,0x42,\ + 0xB4,0x85,0x93,0x70,0x10,0x67,0xBA,0x9D,0x06,0x35,0x4A,0x18,0xD3,0x2B,0x7A,0xCC,\ + 0x51,0x42,0xA1,0x7A,0x63,0xD1,0xE6,0xBB,0xA1,0xC5,0x2B,0xC2,0x36,0xBE,0x13,0x0D,\ + 0xE6,0xBD,0x63,0x7E,0x79,0x7B,0xA7,0x09,0x0D,0x40,0xAB,0x6A,0xDD,0x8F,0x8A,0xC3,\ + 0xF6,0xF6,0x8C,0x1A,0x42,0x05,0x51,0xD4,0x45,0xF5,0x9F,0xA7,0x62,0x21,0x68,0x15,\ + 0x20,0x43,0x3C,0x99,0xE7,0x7C,0xBD,0x24,0xD8,0xA9,0x91,0x17,0x73,0x88,0x3F,0x56,\ + 0x1B,0x31,0x38,0x18,0xB4,0x71,0x0F,0x9A,0xCD,0xC8,0x0E,0x9E,0x8E,0x2E,0x1B,0xE1,\ + 0x8C,0x98,0x83,0xCB,0x1F,0x31,0xF1,0x44,0x4C,0xC6,0x04,0x73,0x49,0x76,0x60,0x0F,\ + 0xC7,0xF8,0xBD,0x17,0x80,0x6B,0x2E,0xE9,0xCC,0x4C,0x0E,0x5A,0x9A,0x79,0x0F,0x20,\ + 0x0A,0x2E,0xD5,0x9E,0x63,0x26,0x1E,0x55,0x92,0x94,0xD8,0x82,0x17,0x5A,0x7B,0xD0,\ + 0xBC,0xC7,0x8F,0x4E,0x86,0x04 ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012

9 years, 12 months

[hbelusca] 64251: [NTVDM]: Fix the PC speaker frequency, that was an octave higher than normal for the pacman.com game of CORE-8436, as well as in Dave and Rescue-Rover (because they use PIT mode 3...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Sep 23 21:04:05 2014 New Revision: 64251 URL: http://svn.reactos.org/svn/reactos?rev=64251&view=rev Log: [NTVDM]: Fix the PC speaker frequency, that was an octave higher than normal for the pacman.com game of CORE-8436, as well as in Dave and Rescue-Rover (because they use PIT mode 3, aka. square wave), but was normal for Advanced Netwars (which uses PIT mode 2, aka. rate generator). Now all those games get correct sound frequency. Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Tue Sep 23 21:04:05 2014 @@ -48,8 +48,8 @@ if (PitChannel2ReloadValue == 0) PitChannel2ReloadValue = 65536; /* Set beep data */ - BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue) * - (PitChannel2->Mode == PIT_MODE_SQUARE_WAVE ? 2 : 1); + BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue) + /* * (PitChannel2->Mode == PIT_MODE_SQUARE_WAVE ? 2 : 1) */; BeepSetParameters.Duration = INFINITE; /* Send the beep */

9 years, 12 months

← Newer
1
...
15
16
17
18
19
20
21
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014