Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[akhaldi] 64240: [D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 23 17:50:22 2014 New Revision: 64240 URL: http://svn.reactos.org/svn/reactos?rev=64240&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/psdk/d3d8.h trunk/reactos/include/psdk/d3d8types.h trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/psdk/d3d8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8.h?rev=64… Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?r… Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=64… Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 12 months

[akhaldi] 64239: [CMAKE/CLANG] * Enable PCH in Clang builds too now. CORE-8516

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 23 17:44:42 2014 New Revision: 64239 URL: http://svn.reactos.org/svn/reactos?rev=64239&view=rev Log: [CMAKE/CLANG] * Enable PCH in Clang builds too now. CORE-8516 Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=64239&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Sep 23 17:44:42 2014 @@ -137,7 +137,7 @@ add_definitions(-D_WINKD_=1) endif() - if((CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

9 years, 12 months

[akhaldi] 64238: [CMAKE] * Use the full path of the PCH file when including it.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Sep 23 17:43:18 2014 New Revision: 64238 URL: http://svn.reactos.org/svn/reactos?rev=64238&view=rev Log: [CMAKE] * Use the full path of the PCH file when including it. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64238&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Sep 23 17:43:18 2014 @@ -371,7 +371,7 @@ # Include the gch in the specified source files, skipping the pch file itself list(REMOVE_ITEM ${_sources} ${_pch}) foreach(_src ${${_sources}}) - set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${_pch_final_name}") + set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}") set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) endforeach() endmacro()

9 years, 12 months

[jgardou] 64237: [NTDLL/LDR] - Mark module entries as "load in progress" when pinning them. CORE-7819 #comment Committed, as a lot of applications rely on this. Feel free to revert if you feel the ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Sep 23 11:32:50 2014 New Revision: 64237 URL: http://svn.reactos.org/svn/reactos?rev=64237&view=rev Log: [NTDLL/LDR] - Mark module entries as "load in progress" when pinning them. CORE-7819 #comment Committed, as a lot of applications rely on this. Feel free to revert if you feel the change is not correct. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Tue Sep 23 11:32:50 2014 @@ -235,7 +235,7 @@ ULONG i; /* Check the action we need to perform */ - if (Flags == LDRP_UPDATE_REFCOUNT) + if ((Flags == LDRP_UPDATE_REFCOUNT) || (Flags == LDRP_UPDATE_PIN)) { /* Make sure entry is not being loaded already */ if (LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)

9 years, 12 months

[tkreuzer] 64236: [GDI32_APITEST] - Add tests for GetClipBox

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Sep 23 11:16:56 2014 New Revision: 64236 URL: http://svn.reactos.org/svn/reactos?rev=64236&view=rev Log: [GDI32_APITEST] - Add tests for GetClipBox Added: trunk/rostests/apitests/gdi32/GetClipBox.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt 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] Tue Sep 23 11:16:56 2014 @@ -35,6 +35,7 @@ GdiGetLocalDC.c GdiReleaseLocalDC.c GdiSetAttrs.c + GetClipBox.c GetClipRgn.c GetCurrentObject.c GetDIBColorTable.c Added: trunk/rostests/apitests/gdi32/GetClipBox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipBox… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipBox.c (added) +++ trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] Tue Sep 23 11:16:56 2014 @@ -0,0 +1,138 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetClipBox + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#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_GetClipBox() +{ + 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); + ok(hWnd != NULL, "CreateWindowW failed\n"); + if (hWnd == NULL) + { + return; + } + + 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()); + + //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); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + 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); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + 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); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + 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); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn2); + 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); + + /* 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); + + /* 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); + + /* Reset clip region */ + SelectClipRgn(hdc, NULL); + SetMetaRgn(hdc); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); + + hrgn = CreateRectRgn(10, 10, 190, 190); + SelectClipRgn(hdc, hrgn); + 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); + + 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); + + ReleaseDC(hWnd, hdc); + DestroyWindow(hWnd); +} + +START_TEST(GetClipBox) +{ + Test_GetClipBox(); +} + Propchange: trunk/rostests/apitests/gdi32/GetClipBox.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Sep 23 11:16:56 2014 @@ -36,6 +36,7 @@ extern void func_GdiGetLocalDC(void); extern void func_GdiReleaseLocalDC(void); extern void func_GdiSetAttrs(void); +extern void func_GetClipBox(void); extern void func_GetClipRgn(void); extern void func_GetCurrentObject(void); extern void func_GetDIBColorTable(void); @@ -95,6 +96,7 @@ { "GdiGetLocalDC", func_GdiGetLocalDC }, { "GdiReleaseLocalDC", func_GdiReleaseLocalDC }, { "GdiSetAttrs", func_GdiSetAttrs }, + { "GetClipBox", func_GetClipBox }, { "GetClipRgn", func_GetClipRgn }, { "GetCurrentObject", func_GetCurrentObject }, { "GetDIBColorTable", func_GetDIBColorTable },

9 years, 12 months

[hbelusca] 64235: [NTVDM] Implement INT 10h, AH=0Bh function 01 (Set Palette) (for CGA modes), and half-plement INT 10h, AH=0Bh function 00 (Set Background/border color), adapted from DosBox. The c...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 22 23:34:41 2014 New Revision: 64235 URL: http://svn.reactos.org/svn/reactos?rev=64235&view=rev Log: [NTVDM] Implement INT 10h, AH=0Bh function 01 (Set Palette) (for CGA modes), and half-plement INT 10h, AH=0Bh function 00 (Set Background/border color), adapted from DosBox. The code needs a bit of cleaning. Needed for a certain Pacman game :) CORE-8436 #resolve #comment Fixed ;) Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Mon Sep 22 23:34:41 2014 @@ -264,7 +264,7 @@ &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) &VideoMode_80x25_text, /* Mode 03h */ // 16 color &VideoMode_320x200_4color, /* Mode 04h */ // CGA 4 color - &VideoMode_320x200_4color, /* Mode 05h */ // CGA same (m) + &VideoMode_320x200_4color, /* Mode 05h */ // CGA same (m) (uses 3rd CGA palette) &VideoMode_640x200_2color, /* Mode 06h */ // CGA 640*200 2 color NULL, /* Mode 07h */ // MDA monochrome text 80*25 NULL, /* Mode 08h */ // PCjr @@ -369,6 +369,8 @@ RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) }; +#if 0 + // Unused at the moment static CONST COLORREF CgaPalette[16] = { @@ -378,28 +380,69 @@ RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) }; -// Unused at the moment +/* CGA palette 1 */ +static CONST BYTE CgaPalette1[] = +{ + 0x00, /* 0 - Black */ + 0x03, /* 1 - Cyan */ + 0x05, /* 2- Magenta */ + 0x07, /* 3 - White */ +} + +/* CGA palette 1 bright */ +static CONST BYTE CgaPalette1i[] = +{ + 0x00, /* 0 - Black */ + 0x13, /* 1 - Light cyan */ + 0x15, /* 2 - Light magenta */ + 0x17, /* 3 - Bright White */ +}; + +/* CGA palette 2 */ +static CONST BYTE CgaPalette2[] = +{ + 0x00, /* 0 - Black */ + 0x02, /* 1 - Green */ + 0x04, /* 2 - Red */ + 0x06, /* 3 - Brown */ +}; + +/* CGA palette 2 bright */ +static CONST BYTE CgaPalette2i[] = +{ + 0x00, /* 0 - Black */ + 0x12, /* 1 - Light green */ + 0x14, /* 2 - Light red */ + 0x16, /* 3 - Yellow */ +}; + +// Unused at the moment; same palette as EgaPalette__16Colors static CONST COLORREF CgaPalette2[VGA_MAX_COLORS / 4] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), + RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), + RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF), RGB(0x55, 0x55, 0x55), RGB(0x55, 0x55, 0xFF), RGB(0x55, 0xFF, 0x55), RGB(0x55, 0xFF, 0xFF), RGB(0xFF, 0x55, 0x55), RGB(0xFF, 0x55, 0xFF), RGB(0xFF, 0xFF, 0x55), RGB(0xFF, 0xFF, 0xFF) }; -static CONST COLORREF EgaPalette___16ColorFixed_DOSBox[VGA_MAX_COLORS / 4] = +#endif + +static CONST COLORREF EgaPalette__16Colors[VGA_MAX_COLORS / 4] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), RGB(0xAA, 0x00, 0x00), RGB(0xAA, 0x00, 0xAA), RGB(0xAA, 0x55, 0x00), RGB(0xAA, 0xAA, 0xAA), @@ -740,6 +783,16 @@ return TRUE; } +static __inline VOID VgaSetSinglePaletteRegister(BYTE Index, BYTE Value) +{ + /* Write the index */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, Index); + + /* Write the data */ + IOWriteB(VGA_AC_WRITE, Value); +} + static BOOLEAN VgaSetRegisters(PVGA_REGISTERS Registers) { INT i; @@ -803,9 +856,7 @@ // DbgPrint("\n"); for (i = 0; i < VGA_AC_MAX_REG; i++) { - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - IOWriteB(VGA_AC_WRITE, Registers->Attribute[i]); + VgaSetSinglePaletteRegister(i, Registers->Attribute[i]); // DbgPrint("Registers->Attribute[%d] = %d\n", i, Registers->Attribute[i]); } // DbgPrint("\n"); @@ -864,17 +915,28 @@ Palette = VgaPalette; Size = sizeof(VgaPalette)/sizeof(VgaPalette[0]); } - else if (ModeNumber == 0x10) + else if (ModeNumber == 0x10) // || (ModeNumber == 0x0D) || (ModeNumber == 0x0E) { /* EGA HiRes mode */ Palette = EgaPalette__HiRes; Size = sizeof(EgaPalette__HiRes)/sizeof(EgaPalette__HiRes[0]); } +#if 0 + else if ((ModeNumber == 0x04) || (ModeNumber == 0x05)) + { + /* + * CGA modes; this palette contains both normal and + * bright versions of CGA palettes 0 and 1 + */ + Palette = CgaPalette2; + Size = sizeof(CgaPalette2)/sizeof(CgaPalette2[0]); + } +#endif else // if ((ModeNumber == 0x0D) || (ModeNumber == 0x0E)) { /* EGA modes */ - Palette = EgaPalette___16ColorFixed_DOSBox; - Size = sizeof(EgaPalette___16ColorFixed_DOSBox)/sizeof(EgaPalette___16ColorFixed_DOSBox[0]); + Palette = EgaPalette__16Colors; + Size = sizeof(EgaPalette__16Colors)/sizeof(EgaPalette__16Colors[0]); } VgaSetPalette(Palette, Size); @@ -1271,6 +1333,87 @@ break; } + /* Set Video Colors */ + case 0x0B: + { + if (Bda->VideoMode < 4 || Bda->VideoMode > 6) + { + DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X is unsupported for non-CGA modes\n", + getAH(), getBH()); + break; + } + + switch (getBH()) + { + case 0x00: /* Set Background/Border Color */ + { +#ifdef DOSBOX + BYTE Index = getBL(); + BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; + CrtColorPaletteMask = (CrtColorPaletteMask & 0xE0) | (Index & 0x1F); + Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + Index = ((Index << 1) & 0x10) | (Index & 0x7); + + /* Always set the overscan color */ + VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, Index); + + /* Don't set any extra colors when in text mode */ + if (Bda->VideoMode <= 3) break; + + VgaSetSinglePaletteRegister(0x00, Index); + + Index = (CrtColorPaletteMask & 0x10) | 0x02 | ((CrtColorPaletteMask & 0x20) >> 5); + + VgaSetSinglePaletteRegister(0x01, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x02, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x03, Index); +#else + /* Background/Border Color is modifiable via the first index */ + VgaSetSinglePaletteRegister(0x00, getBL()); +#endif + + /* Enable screen and disable palette access */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, 0x20); + break; + } + + case 0x01: /* Set Palette */ + { + BYTE Index = getBL(); + BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; + CrtColorPaletteMask = (CrtColorPaletteMask & 0xDF) | ((Index & 1) ? 0x20 : 0x0); + Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + /* Don't set any extra colors when in text mode */ + if (Bda->VideoMode <= 3) break; + + Index = (CrtColorPaletteMask & 0x10) | 0x02 | Index; + + VgaSetSinglePaletteRegister(0x01, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x02, Index); + Index += 2; + VgaSetSinglePaletteRegister(0x03, Index); + + /* Enable screen and disable palette access */ + IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state + IOWriteB(VGA_AC_INDEX, 0x20); + break; + } + + default: + DPRINT1("BIOS Function INT 10h, AH = 0Bh, BH = 0x%02X NOT IMPLEMENTED\n", + getAH(), getBH()); + break; + } + + break; + } + /* Teletype Output */ case 0x0E: { @@ -1294,12 +1437,7 @@ /* Set Single Palette Register */ case 0x00: { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, getBL()); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); + VgaSetSinglePaletteRegister(getBL(), getBH()); /* Enable screen and disable palette access */ IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state @@ -1310,12 +1448,7 @@ /* Set Overscan Color */ case 0x01: { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, getBH()); + VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, getBH()); /* Enable screen and disable palette access */ IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state @@ -1332,15 +1465,11 @@ /* Set the palette registers */ for (i = 0; i <= VGA_AC_PAL_F_REG; i++) { - /* Write the index */ - IOReadB(VGA_INSTAT1_READ); // Put the AC register into index state - IOWriteB(VGA_AC_INDEX, i); - - /* Write the data */ - IOWriteB(VGA_AC_WRITE, Buffer[i]); + VgaSetSinglePaletteRegister(i, Buffer[i]); } /* Set the overscan register */ + // VgaSetSinglePaletteRegister(VGA_AC_OVERSCAN_REG, Buffer[VGA_AC_PAL_F_REG + 1]); IOWriteB(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); IOWriteB(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); @@ -1509,7 +1638,7 @@ /* Display combination code */ case 0x1A: { - switch(getAL()) + switch (getAL()) { case 0x00: /* Get Display combiantion code */ setAX(MAKEWORD(0x1A, 0x1A)); @@ -1526,8 +1655,8 @@ default: { - DPRINT1("BIOS Function INT 10h, AH = 0x%02X NOT IMPLEMENTED\n", - getAH()); + DPRINT1("BIOS Function INT 10h, AH = 0x%02X, AL = 0x%02X, BH = 0x%02X NOT IMPLEMENTED\n", + getAH(), getAL(), getBH()); } } } @@ -1573,8 +1702,8 @@ ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; /* Initialize the VGA BDA data */ - Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ - Bda->VGASwitches = 0x09; /* High-resolution */ + Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ + Bda->VGASwitches = 0x09; /* High-resolution */ // // FIXME: At the moment we always set a VGA mode. In the future,

9 years, 12 months

[tkreuzer] 64234: [KSECDD] CORE-8542 #comment Disable read of performance counters until it has been investigated, what the exact CPU requirements are and how we can detect them. This will only low...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 22 22:46:10 2014 New Revision: 64234 URL: http://svn.reactos.org/svn/reactos?rev=64234&view=rev Log: [KSECDD] CORE-8542 #comment Disable read of performance counters until it has been investigated, what the exact CPU requirements are and how we can detect them. This will only lower the amount "random" entropy data, nothing severe. Should fix bugcheck on qemu. Modified: trunk/reactos/drivers/crypto/ksecdd/random.c Modified: trunk/reactos/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Mon Sep 22 22:46:10 2014 @@ -63,7 +63,7 @@ /* Read the TSC value */ MachineSpecificCounters->Tsc = __rdtsc(); } - +#if 0 // FIXME: investigate what the requirements are for these /* Read the CPU event counter MSRs */ //MachineSpecificCounters->Ctr0 = __readmsr(0x12); //MachineSpecificCounters->Ctr1 = __readmsr(0x13); @@ -75,6 +75,7 @@ MachineSpecificCounters->Pmc0 = __readpmc(0); MachineSpecificCounters->Pmc1 = __readpmc(1); } +#endif #else #error Implement me! #endif

9 years, 12 months

[pschweitzer] 64233: [NTFS] Also add missing defines about index size and index header for INDEX_ROOT attribute. Implemented their support in NtfsDumpFileAttributes().

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 22 20:26:21 2014 New Revision: 64233 URL: http://svn.reactos.org/svn/reactos?rev=64233&view=rev Log: [NTFS] Also add missing defines about index size and index header for INDEX_ROOT attribute. Implemented their support in NtfsDumpFileAttributes(). Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Mon Sep 22 20:26:21 2014 @@ -175,6 +175,16 @@ ASSERT(IndexRootAttr->CollationRule == COLLATION_FILE_NAME); DbgPrint(" $INDEX_ROOT (%uB, %u) ", IndexRootAttr->SizeOfEntry, IndexRootAttr->ClustersPerIndexRecord); + + if (IndexRootAttr->Header.Flags == INDEX_ROOT_SMALL) + { + DbgPrint(" (small) "); + } + else + { + ASSERT(IndexRootAttr->Header.Flags == INDEX_ROOT_LARGE); + DbgPrint(" (large) "); + } } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Sep 22 20:26:21 2014 @@ -194,6 +194,8 @@ #define COLLATION_NTOFS_SECURITY_HASH 0x12 #define COLLATION_NTOFS_ULONGS 0x13 +#define INDEX_ROOT_SMALL 0x0 +#define INDEX_ROOT_LARGE 0x1 typedef struct { @@ -313,11 +315,21 @@ typedef struct { + ULONG FirstEntryOffset; + ULONG TotalSizeOfEntries; + ULONG AllocatedSize; + UCHAR Flags; + UCHAR Padding[3]; +} INDEX_HEADER_ATTRIBUTE, *PINDEX_HEADER_ATTRIBUTE; + +typedef struct +{ ULONG AttributeType; ULONG CollationRule; ULONG SizeOfEntry; UCHAR ClustersPerIndexRecord; UCHAR Padding[3]; + INDEX_HEADER_ATTRIBUTE Header; } INDEX_ROOT_ATTRIBUTE, *PINDEX_ROOT_ATTRIBUTE; typedef struct

9 years, 12 months

[pschweitzer] 64232: [NTFS] Add missing defines about INDEX_ROOT attributes and collation rules. Implemented their support in NtfsDumpFileAttributes(). Sources: http://ftp.kolibrios.org/users/Asper...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 22 19:59:45 2014 New Revision: 64232 URL: http://svn.reactos.org/svn/reactos?rev=64232&view=rev Log: [NTFS] Add missing defines about INDEX_ROOT attributes and collation rules. Implemented their support in NtfsDumpFileAttributes(). Sources: http://ftp.kolibrios.org/users/Asper/docs/NTFS/ntfsdoc.html#attribute_index… and Linux kernel. Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/a… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Mon Sep 22 19:59:45 2014 @@ -163,6 +163,23 @@ static VOID +NtfsDumpIndexRootAttribute(PATTRIBUTE Attribute) +{ + PRESIDENT_ATTRIBUTE ResAttr; + PINDEX_ROOT_ATTRIBUTE IndexRootAttr; + + ResAttr = (PRESIDENT_ATTRIBUTE)Attribute; + IndexRootAttr = (PINDEX_ROOT_ATTRIBUTE)((ULONG_PTR)ResAttr + ResAttr->ValueOffset); + + if (IndexRootAttr->AttributeType == AttributeFileName) + ASSERT(IndexRootAttr->CollationRule == COLLATION_FILE_NAME); + + DbgPrint(" $INDEX_ROOT (%uB, %u) ", IndexRootAttr->SizeOfEntry, IndexRootAttr->ClustersPerIndexRecord); +} + + +static +VOID NtfsDumpAttribute (PATTRIBUTE Attribute) { PNONRESIDENT_ATTRIBUTE NresAttr; @@ -207,7 +224,7 @@ break; case AttributeIndexRoot: - DbgPrint(" $INDEX_ROOT "); + NtfsDumpIndexRootAttribute(Attribute); break; case AttributeIndexAllocation: Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Sep 22 19:59:45 2014 @@ -186,6 +186,14 @@ AttributeLoggedUtilityStream = 0x100 } ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; +#define COLLATION_BINARY 0x00 +#define COLLATION_FILE_NAME 0x01 +#define COLLATION_UNICODE_STRING 0x02 +#define COLLATION_NTOFS_ULONG 0x10 +#define COLLATION_NTOFS_SID 0x11 +#define COLLATION_NTOFS_SECURITY_HASH 0x12 +#define COLLATION_NTOFS_ULONGS 0x13 + typedef struct { @@ -305,6 +313,15 @@ typedef struct { + ULONG AttributeType; + ULONG CollationRule; + ULONG SizeOfEntry; + UCHAR ClustersPerIndexRecord; + UCHAR Padding[3]; +} INDEX_ROOT_ATTRIBUTE, *PINDEX_ROOT_ATTRIBUTE; + +typedef struct +{ ULONGLONG Unknown1; UCHAR MajorVersion; UCHAR MinorVersion;

9 years, 12 months

[akhaldi] 64231: [FLTLIB] * Import from Wine 1.7.27. CORE-8543 #resolve #comment Added in r64231. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 22 19:24:12 2014 New Revision: 64231 URL: http://svn.reactos.org/svn/reactos?rev=64231&view=rev Log: [FLTLIB] * Import from Wine 1.7.27. CORE-8543 #resolve #comment Added in r64231. CORE-8540 Added: trunk/reactos/dll/win32/fltlib/ (with props) trunk/reactos/dll/win32/fltlib/CMakeLists.txt (with props) trunk/reactos/dll/win32/fltlib/fltlib.c (with props) trunk/reactos/dll/win32/fltlib/fltlib.spec (with props) trunk/reactos/dll/win32/fltlib/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -39,6 +39,7 @@ add_subdirectory(dnsapi) add_subdirectory(dwmapi) add_subdirectory(faultrep) +add_subdirectory(fltlib) add_subdirectory(fmifs) if(ARCH STREQUAL "i386") add_subdirectory(framedyn) Propchange: trunk/reactos/dll/win32/fltlib/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 22 19:24:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/fltlib/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/fltlib/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/fltlib/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/fltlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fltlib/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/fltlib/CMakeLists.txt [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -0,0 +1,15 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +spec2def(fltlib.dll fltlib.spec) + +list(APPEND SOURCE + fltlib.c + ${CMAKE_CURRENT_BINARY_DIR}/fltlib_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/fltlib.def) + +add_library(fltlib SHARED ${SOURCE} rsrc.rc) +set_module_type(fltlib win32dll) +target_link_libraries(fltlib wine) +add_importlibs(fltlib msvcrt kernel32 ntdll) +add_cd_file(TARGET fltlib DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/fltlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/fltlib/fltlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.c?… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.c (added) +++ trunk/reactos/dll/win32/fltlib/fltlib.c [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -0,0 +1,92 @@ +/* + * Copyright 2009 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fltlib); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* use native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + return TRUE; +} + +/********************************************************************** + * FilterConnectCommunicationPort (FLTLIB.@) + */ +HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOptions, + LPVOID lpContext, DWORD dwSizeOfContext, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + HANDLE *hPort) +{ + FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, + lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); + + *hPort = INVALID_HANDLE_VALUE; + return E_NOTIMPL; +} + +/********************************************************************** + * FilterFindFirst (FLTLIB.@) + */ +HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, + LPHANDLE handle) +{ + FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); + return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); +} + +/********************************************************************** + * FilterFindClose (FLTLIB.@) + */ +HRESULT WINAPI FilterFindClose(HANDLE handle) +{ + FIXME("(%p) stub\n", handle); + return S_OK; +} + +/********************************************************************** + * FilterUnload (FLTLIB.@) + */ +HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +{ + FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + + if (!lpFilterName) + return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); + + return S_OK; +} Propchange: trunk/reactos/dll/win32/fltlib/fltlib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/fltlib/fltlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/fltlib.sp… ============================================================================== --- trunk/reactos/dll/win32/fltlib/fltlib.spec (added) +++ trunk/reactos/dll/win32/fltlib/fltlib.spec [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -0,0 +1,29 @@ +@ stub FilterAttach +@ stub FilterAttachAtAltitude +@ stub FilterClose +@ stdcall FilterConnectCommunicationPort(wstr long ptr long ptr ptr) +@ stub FilterCreate +@ stub FilterDetach +@ stdcall FilterFindClose(ptr) +@ stdcall FilterFindFirst(long ptr long ptr ptr) +@ stub FilterFindNext +@ stub FilterGetDosName +@ stub FilterGetInformation +@ stub FilterGetMessage +@ stub FilterInstanceClose +@ stub FilterInstanceCreate +@ stub FilterInstanceFindClose +@ stub FilterInstanceFindFirst +@ stub FilterInstanceFindNext +@ stub FilterInstanceGetInformation +@ stub FilterLoad +@ stub FilterReplyMessage +@ stub FilterSendMessage +@ stdcall FilterUnload(wstr) +@ stub FilterVolumeClose +@ stub FilterVolumeFindClose +@ stub FilterVolumeFindFirst +@ stub FilterVolumeFindNext +@ stub FilterVolumeInstanceFindClose +@ stub FilterVolumeInstanceFindFirst +@ stub FilterVolumeInstanceFindNext Propchange: trunk/reactos/dll/win32/fltlib/fltlib.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/fltlib/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fltlib/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/fltlib/rsrc.rc (added) +++ trunk/reactos/dll/win32/fltlib/rsrc.rc [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -0,0 +1,27 @@ +/* + * Copyright 2014 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Filter Library" +#define WINE_FILENAME_STR "fltlib.dll" + +#define WINE_FILEVERSION 5,1,2600,5512 +#define WINE_FILEVERSION_STR "5.1.2600.5512" +#define WINE_PRODUCTVERSION 5,1,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.1.2600.5512" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/fltlib/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 22 19:24:12 2014 @@ -73,6 +73,7 @@ reactos/dll/win32/dciman32 # Synced to Wine-1.7.17 reactos/dll/win32/dwmapi # Synced to Wine-1.7.17 reactos/dll/win32/faultrep # Synced to Wine-1.7.17 +reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to Wine-1.7.17 reactos/dll/win32/gdiplus # Synced to Wine-1.7.17 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.17

9 years, 12 months

← Newer
1
...
17
18
19
20
21
22
23
...
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