Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 73913: [COMCTL32_APITEST] -Add one more test.
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 22:28:47 2017 New Revision: 73913 URL: http://svn.reactos.org/svn/reactos?rev=73913&view=rev Log: [COMCTL32_APITEST] -Add one more test. Modified: trunk/rostests/apitests/comctl32/button.c Modified: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Sat Feb 25 22:28:47 2017 @@ -79,6 +79,10 @@ ok (imlData.himl == (HIMAGELIST)0xdead, "Expected 0 himl\n"); ok (imlData.uAlign == 0, "Expected 0 uAlign\n"); ok_rect(imlData.margin, 0, 0, 0, 1); + + imlData.himl = 0; + ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == FALSE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ } START_TEST(button)

1 0

[gadamopoulos] 73912: [COMCTL32] -Test BCM_SETTEXTMARGIN, BCM_SETIMAGELIST, BCM_GETIMAGELIST and BCM_GETTEXTMARGIN for the v6 button.
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 22:12:08 2017 New Revision: 73912 URL: http://svn.reactos.org/svn/reactos?rev=73912&view=rev Log: [COMCTL32] -Test BCM_SETTEXTMARGIN, BCM_SETIMAGELIST, BCM_GETIMAGELIST and BCM_GETTEXTMARGIN for the v6 button. Added: trunk/rostests/apitests/comctl32/ trunk/rostests/apitests/comctl32/CMakeLists.txt (with props) trunk/rostests/apitests/comctl32/button.c (with props) trunk/rostests/apitests/comctl32/comctl32_apitest.rc (with props) trunk/rostests/apitests/comctl32/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sat Feb 25 22:12:08 2017 @@ -6,6 +6,7 @@ add_subdirectory(atl) add_subdirectory(browseui) add_subdirectory(com) +add_subdirectory(comctl32) add_subdirectory(crt) add_subdirectory(dbghelp) add_subdirectory(dciman32) Added: trunk/rostests/apitests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/comctl32/CMakeLists.txt (added) +++ trunk/rostests/apitests/comctl32/CMakeLists.txt [iso-8859-1] Sat Feb 25 22:12:08 2017 @@ -0,0 +1,6 @@ + +add_executable(comctl32_apitest button.c testlist.c comctl32_apitest.rc) +target_link_libraries(comctl32_apitest wine) +set_module_type(comctl32_apitest win32cui) +add_importlibs(comctl32_apitest user32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET comctl32_apitest) Propchange: trunk/rostests/apitests/comctl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/button.… ============================================================================== --- trunk/rostests/apitests/comctl32/button.c (added) +++ trunk/rostests/apitests/comctl32/button.c [iso-8859-1] Sat Feb 25 22:12:08 2017 @@ -0,0 +1,90 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for Button window class v6 + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include "wine/test.h" +#include <windows.h> +#include <commctrl.h> + +#define ok_rect(rc, l,r,t,b) ok((rc.left == (l)) && (rc.right == (r)) && (rc.top == (t)) && (rc.bottom == (b)), "Wrong rect. expected %d, %d, %d, %d got %ld, %ld, %ld, %ld\n", l,t,r,b, rc.left, rc.top, rc.right, rc.bottom) + +void Test_TextMargin() +{ + RECT rc; + BOOL ret; + HWND hwnd1; + + hwnd1 = CreateWindowW(L"Button", L"Test1", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_GETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_GETTEXTMARGIN to succeed\n"); + ok_rect(rc, 1, 1, 1, 1); + + SetRect(&rc, 0,0,0,0); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_GETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_GETTEXTMARGIN to succeed\n"); + ok_rect(rc, 0, 0, 0, 0); + + SetRect(&rc, -1,-1,-1,-1); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_GETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_GETTEXTMARGIN to succeed\n"); + ok_rect(rc, -1, -1, -1, -1); + + SetRect(&rc, 1000,1000,1000,1000); + ret = SendMessageW(hwnd1, BCM_SETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_SETTEXTMARGIN to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_GETTEXTMARGIN, 0, (LPARAM)&rc); + ok (ret == TRUE, "Expected BCM_GETTEXTMARGIN to succeed\n"); + ok_rect(rc, 1000, 1000, 1000, 1000); + + DestroyWindow(hwnd1); +} + +void Test_Imagelist() +{ + HWND hwnd1; + BOOL ret; + BUTTON_IMAGELIST imlData; + + hwnd1 = CreateWindowW(L"Button", L"Test2", 0, 10, 10, 100, 100, 0, NULL, NULL, NULL); + ok (hwnd1 != NULL, "Expected CreateWindowW to succeed\n"); + + ret = SendMessageW(hwnd1, BCM_GETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == TRUE, "Expected BCM_GETIMAGELIST to succeed\n"); + ok (imlData.himl == 0, "Expected 0 himl\n"); + ok (imlData.uAlign == 0, "Expected 0 uAlign\n"); + ok_rect(imlData.margin, 0, 0, 0, 0); + + SetRect(&imlData.margin, 0,0,0,1); + ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == FALSE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + + imlData.himl = (HIMAGELIST)0xdead; + ret = SendMessageW(hwnd1, BCM_SETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == TRUE, "Expected BCM_SETIMAGELIST to fail\n"); /* This works in win10 */ + + ret = SendMessageW(hwnd1, BCM_GETIMAGELIST, 0, (LPARAM)&imlData); + ok (ret == TRUE, "Expected BCM_GETIMAGELIST to succeed\n"); + ok (imlData.himl == (HIMAGELIST)0xdead, "Expected 0 himl\n"); + ok (imlData.uAlign == 0, "Expected 0 uAlign\n"); + ok_rect(imlData.margin, 0, 0, 0, 1); +} + +START_TEST(button) +{ + LoadLibraryW(L"comctl32.dll"); /* same as statically linking to comctl32 and doing InitCommonControls */ + Test_TextMargin(); + Test_Imagelist(); +} + Propchange: trunk/rostests/apitests/comctl32/button.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/comctl32/comctl32_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32_apitest.rc (added) +++ trunk/rostests/apitests/comctl32/comctl32_apitest.rc [iso-8859-1] Sat Feb 25 22:12:08 2017 @@ -0,0 +1,7 @@ +#include <windef.h> +#include <winuser.h> +#include <dlgs.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include <reactos/manifest_exe.rc> Propchange: trunk/rostests/apitests/comctl32/comctl32_apitest.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/testlis… ============================================================================== --- trunk/rostests/apitests/comctl32/testlist.c (added) +++ trunk/rostests/apitests/comctl32/testlist.c [iso-8859-1] Sat Feb 25 22:12:08 2017 @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_button(void); + +const struct test winetest_testlist[] = +{ + { "button", func_button }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/comctl32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 73911: [RAPPS] Check for dead links/changes in RAPPS DB
by dreimer＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: dreimer Date: Sat Feb 25 20:46:26 2017 New Revision: 73911 URL: http://svn.reactos.org/svn/reactos?rev=73911&view=rev Log: [RAPPS] Check for dead links/changes in RAPPS DB Modified: trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/utorrent.txt Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… ============================================================================== --- trunk/reactos/media/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/bittorrent.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -3,7 +3,7 @@ Version = CURRENT License = Freeware for non-commercial uses Description = The original BitTorrent client. -Size = 2.3 MiB +Size = 2.1 MiB Category = 5 URLSite = http://www.bittorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/bittorrent/os/windows/track/stabl… @@ -12,7 +12,7 @@ [Section.0407] License = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Der Original BitTorrent Client. -Size = 2,3 MiB +Size = 2,1 MiB [Section.0a] License = Gratuito para uso no comercial @@ -28,17 +28,17 @@ [Section.0418] License = GratuitÄ pentru uz necomercial Description = Originalul client BitTorrent. -Size = 2,3 Mio +Size = 2,1 Mio [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾, Ð´Ð»Ñ Ð½Ðµ ÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Description = ÐÑÐ¸Ð³Ð¸Ð½Ð°Ð»ÑÐ½ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent -Size = 2,3 ÐÐ¸Ð +Size = 2,1 ÐÐ¸Ð [Section.041f] License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz. Description = ÃzgÃ¼n BitTorrent istemcisi. -Size = 2,3 MiB +Size = 2,1 MiB [Section.0804] Description = åæ¬ç BitTorrent å®¢æ·ç«¯ã Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… ============================================================================== --- trunk/reactos/media/rapps/burnawarefree.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/burnawarefree.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -7,7 +7,7 @@ Category = 12 URLSite = http://www.burnaware.com/ URLDownload = http://www.burnaware.com/downloads/burnaware_free_9.3.exe -SHA1 = 45e06d622ef9dd345b3b93c19d37d93bd7af4817 +SHA1 = b79dcfb18441abd79dd858535fb33a0a119e4855 CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/miktex.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/miktex.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -1,18 +1,18 @@ [Section] Name = MikTEX 2.9 -Version = 2.9.6161 +Version = 2.9.6236 License = Freeware Description = An up-to-date implementation of TeX/LaTeX and related programs for Windows. -Size = 179.6 MiB +Size = 181.8 MiB Category = 6 URLSite = http://www.miktex.org/ URLDownload = http://ftp.gwdg.de/pub/ctan/systems/win32/miktex/setup/basic-miktex.exe -SHA1 = ac16ee0ccb4e8f7d3d960b37b98c1a1520580f65 +SHA1 = 49804d4daec38167ec103a40a91ac2fb8f8a58e5 CDPath = none [Section.0407] Description = Aktuelle Implementierung von TeX/LaTeX und zugehÃ¶riger Programme fÃ¼r Windows. -Size = 179,6 MiB +Size = 181,8 MiB [Section.0a] License = Gratuita @@ -21,17 +21,17 @@ [Section.0418] License = GratuitÄ Description = MikTEX este o implementare actualizatÄ de TeX/LaTeX Èi aprogramelor aferente. -Size = 179,6 Mio +Size = 181,8 Mio [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾ Description = ÐÑÐºÑÑÑÑÐ¹ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð² TeX/LaTeX Ð´Ð»Ñ Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ñ Windows. -Size = 179,6 ÐÐ¸Ð +Size = 181,8 ÐÐ¸Ð [Section.041f] License = Ãcretsiz Description = Windows iÃ§in, TeX'in, LaTeX'in ve iliÅkili izlencelerin bir Åimdiki uygulamasÄ±. -Size = 179,6 MiB +Size = 181,8 MiB [Section.0804] Description = TeX/LaTeX åç¸å³çç¨åºç Windows çä¸ä¸ªææ°æ§è¡æåµã Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=7… ============================================================================== --- trunk/reactos/media/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/mirc.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -1,13 +1,13 @@ [Section] Name = mIRC 7 -Version = 7.46 +Version = 7.47 License = Shareware Description = The most popular client for the Internet Relay Chat (IRC). Size = 2.6 MiB Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/16/mirc746.exe -SHA1 = d99b89649888944364ad8bd69261d8e13434a479 +URLDownload = http://download.mirc.com/17/mirc747.exe +SHA1 = b0ec0b88d9e3f26df3731d782bdd8da06c2f9882 CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… ============================================================================== --- trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ultravnc.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -7,7 +7,7 @@ Category = 5 URLSite = http://www.uvnc.com/ URLDownload = http://www.uvnc.eu/download/1211/UltraVNC_1_2_11_X86_Setup.exe -SHA1 = 8416a4a9b57ecfc09b4cba81b8a275010c8b4d8b +SHA1 = c91787ed1e87b8d80348c4857b1a98bd0f2d307b CDPath = none [Section.0407] Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… ============================================================================== --- trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/utorrent.txt [iso-8859-1] Sat Feb 25 20:46:26 2017 @@ -3,7 +3,7 @@ Version = CURRENT License = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 2.1 MiB +Size = 2.3 MiB Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/utorrent/os/windows/track/stable/… @@ -12,7 +12,7 @@ [Section.0407] License = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Kleiner und schneller BitTorrent Client. -Size = 2,1 MiB +Size = 2,3 MiB [Section.0a] License = Gratuito para uso no comercial @@ -21,7 +21,7 @@ [Section.040c] License = Gratuit pour une utilisation non-commerciale Description = Client BitTorrent petit et rapide. -Size = 2,1 Mio +Size = 2,3 Mio [Section.0410] License = Gratuita per un uso non-commerciale @@ -38,17 +38,17 @@ [Section.0418] License = GratuitÄ pentru uz necomercial Description = Client BitTorrent, mic Èi rapid. -Size = 2,1 Mio +Size = 2,3 Mio [Section.0419] License = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent. -Size = 2,1 ÐÐ¸Ð +Size = 2,3 ÐÐ¸Ð [Section.041f] License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz. Description = KÃ¼Ã§Ã¼k ve hÄ±zlÄ± BitTorrent istemcisi. -Size = 2,1 MiB +Size = 2,3 MiB [Section.0422] License = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð° Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼ÐµÑÑÑÐ¹Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ

1 0

[tfaber] 73910: [ACPICA] - Update to version 20160729 CORE-12833
by tfaber＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: tfaber Date: Sat Feb 25 20:45:15 2017 New Revision: 73910 URL: http://svn.reactos.org/svn/reactos?rev=73910&view=rev Log: [ACPICA] - Update to version 20160729 CORE-12833 Added: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgccex.h (with props) Removed: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwinex.h Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h trunk/reactos/drivers/bus/acpi/acpica/include/acconfig.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/accygwin.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acdragonfly.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefi.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefiex.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenvex.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acfreebsd.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/achaiku.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvcex.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acnetbsd.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acos2.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acqnx.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utbuffer.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acclib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/accygwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acdragonfly.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acefiex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenvex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Added: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acgccex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/achaiku.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acintel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acmsvcex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acnetbsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acos2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acqnx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Removed: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwinex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut…

1 0

[tfaber] 73909: [ACPICA] - Update to version 20160527 CORE-12833
by tfaber＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: tfaber Date: Sat Feb 25 20:06:05 2017 New Revision: 73909 URL: http://svn.reactos.org/svn/reactos?rev=73909&view=rev Log: [ACPICA] - Update to version 20160527 CORE-12833 Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utascii.c (with props) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -132,9 +132,10 @@ acpica/tables/tbxfroot.c acpica/utilities/utaddress.c acpica/utilities/utalloc.c + acpica/utilities/utascii.c acpica/utilities/utbuffer.c acpica/utilities/utcache.c - acpica/utilities/utclib.c + # acpica/utilities/utclib.c acpica/utilities/utcopy.c # acpica/utilities/utdebug.c acpica/utilities/utdecode.c Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -460,6 +460,9 @@ { ObjDesc->Method.Mutex->Mutex.OriginalSyncLevel = ObjDesc->Method.Mutex->Mutex.SyncLevel; + + ObjDesc->Method.Mutex->Mutex.ThreadId = + AcpiOsGetThreadId (); } } Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -603,12 +603,14 @@ } else if (ParentOp->Common.AmlOpcode == AML_EXTERNAL_OP) { - /* TBD: May only be temporary */ - - ObjDesc = AcpiUtCreateStringObject ((ACPI_SIZE) NameLength); - - strncpy (ObjDesc->String.Pointer, NameString, NameLength); - Status = AE_OK; + /* + * This opcode should never appear here. It is used only + * by AML disassemblers and is surrounded by an If(0) + * by the ASL compiler. + * + * Therefore, if we see it here, it is a serious error. + */ + Status = AE_AML_BAD_OPCODE; } else { Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -204,7 +204,7 @@ ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "Bytes from stream:\n")); for (Index = 0; - (Index < ACPI_NAME_SIZE) && (AcpiUtValidAcpiChar (*AmlAddress, 0)); + (Index < ACPI_NAME_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0)); Index++) { CharBuf[Index] = *AmlAddress++; Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -385,6 +385,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoPcctHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoPcct0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoPcct1[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoPcct2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3pt[]; Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -321,6 +321,7 @@ ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_CstyleDisassembly, TRUE); ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_ForceAmlDisassembly, FALSE); ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_DmOpt_Verbose, TRUE); +ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_DmEmitExternalOpcodes, FALSE); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DmOpt_Disasm); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DmOpt_Listing); Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -1025,24 +1025,24 @@ /* Parse object flags */ -#define ACPI_PARSEOP_GENERIC 0x01 -#define ACPI_PARSEOP_NAMED 0x02 -#define ACPI_PARSEOP_DEFERRED 0x04 -#define ACPI_PARSEOP_BYTELIST 0x08 -#define ACPI_PARSEOP_IN_STACK 0x10 -#define ACPI_PARSEOP_TARGET 0x20 -#define ACPI_PARSEOP_IN_CACHE 0x80 +#define ACPI_PARSEOP_GENERIC 0x01 +#define ACPI_PARSEOP_NAMED_OBJECT 0x02 +#define ACPI_PARSEOP_DEFERRED 0x04 +#define ACPI_PARSEOP_BYTELIST 0x08 +#define ACPI_PARSEOP_IN_STACK 0x10 +#define ACPI_PARSEOP_TARGET 0x20 +#define ACPI_PARSEOP_IN_CACHE 0x80 /* Parse object DisasmFlags */ -#define ACPI_PARSEOP_IGNORE 0x01 -#define ACPI_PARSEOP_PARAMLIST 0x02 -#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04 -#define ACPI_PARSEOP_PREDEF_CHECKED 0x08 -#define ACPI_PARSEOP_CLOSING_PAREN 0x10 -#define ACPI_PARSEOP_COMPOUND 0x20 -#define ACPI_PARSEOP_ASSIGNMENT 0x40 -#define ACPI_PARSEOP_ELSEIF 0x80 +#define ACPI_PARSEOP_IGNORE 0x01 +#define ACPI_PARSEOP_PARAMETER_LIST 0x02 +#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04 +#define ACPI_PARSEOP_PREDEFINED_CHECKED 0x08 +#define ACPI_PARSEOP_CLOSING_PAREN 0x10 +#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x20 +#define ACPI_PARSEOP_ASSIGNMENT 0x40 +#define ACPI_PARSEOP_ELSEIF 0x80 /***************************************************************************** Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -264,10 +264,6 @@ #define ACPI_IS_MISALIGNED(value) (((ACPI_SIZE) value) & (sizeof(ACPI_SIZE)-1)) -/* Generic (power-of-two) rounding */ - -#define ACPI_IS_POWER_OF_TWO(a) (((a) & ((a) - 1)) == 0) - /* * Bitmask creation * Bit positions start at zero. @@ -291,10 +287,10 @@ /* Generic bitfield macros and masks */ #define ACPI_GET_BITS(SourcePtr, Position, Mask) \ - ((*SourcePtr >> Position) & Mask) + ((*(SourcePtr) >> (Position)) & (Mask)) #define ACPI_SET_BITS(TargetPtr, Position, Mask, Value) \ - (*TargetPtr |= ((Value & Mask) << Position)) + (*(TargetPtr) |= (((Value) & (Mask)) << (Position))) #define ACPI_1BIT_MASK 0x00000001 #define ACPI_2BIT_MASK 0x00000003 Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acoutput.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -372,7 +372,7 @@ ACPI_TRACE_ENTRY (Name, AcpiUtTraceU32, UINT32, Value) #define ACPI_FUNCTION_TRACE_STR(Name, String) \ - ACPI_TRACE_ENTRY (Name, AcpiUtTraceStr, char *, String) + ACPI_TRACE_ENTRY (Name, AcpiUtTraceStr, const char *, String) #define ACPI_FUNCTION_ENTRY() \ AcpiUtTrackStackPtr() @@ -431,6 +431,9 @@ #define return_PTR(Pointer) \ ACPI_TRACE_EXIT (AcpiUtPtrExit, void *, Pointer) + +#define return_STR(String) \ + ACPI_TRACE_EXIT (AcpiUtStrExit, const char *, String) #define return_VALUE(Value) \ ACPI_TRACE_EXIT (AcpiUtValueExit, UINT64, Value) @@ -486,6 +489,7 @@ #define return_VOID return #define return_ACPI_STATUS(s) return(s) #define return_PTR(s) return(s) +#define return_STR(s) return(s) #define return_VALUE(s) return(s) #define return_UINT8(s) return(s) #define return_UINT32(s) return(s) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20160318 +#define ACPI_CA_VERSION 0x20160527 #include "acconfig.h" #include "actypes.h" Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acpredef.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -131,7 +131,8 @@ ACPI_PTYPE2_REV_FIXED = 9, ACPI_PTYPE2_FIX_VAR = 10, ACPI_PTYPE2_VAR_VAR = 11, - ACPI_PTYPE2_UUID_PAIR = 12 + ACPI_PTYPE2_UUID_PAIR = 12, + ACPI_PTYPE_CUSTOM = 13 }; @@ -344,7 +345,7 @@ {{"_BIX", METHOD_0ARGS, METHOD_RETURNS (ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int),(4 Str) */ - PACKAGE_INFO (ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING, 4,0), + PACKAGE_INFO (ACPI_PTYPE_CUSTOM, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING, 4,0), {{"_BLT", METHOD_3ARGS (ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER), METHOD_NO_RETURN_VALUE}}, Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acrestyp.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -485,6 +485,7 @@ UINT8 Type; \ UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */\ UINT8 SlaveMode; \ + UINT8 ConnectionSharing; \ UINT8 TypeRevisionId; \ UINT16 TypeDataLength; \ UINT16 VendorLength; \ Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actables.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actables.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -246,10 +246,6 @@ AcpiTbParseRootTable ( ACPI_PHYSICAL_ADDRESS RsdpAddress); -BOOLEAN -AcpiIsValidSignature ( - char *Signature); - /* * tbxfload Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actbl3.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -563,9 +563,10 @@ enum AcpiPcctType { - ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0, - ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1, - ACPI_PCCT_TYPE_RESERVED = 2 /* 2 and greater are reserved */ + ACPI_PCCT_TYPE_GENERIC_SUBSPACE = 0, + ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE = 1, + ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2 = 2, /* ACPI 6.1 */ + ACPI_PCCT_TYPE_RESERVED = 3 /* 3 and greater are reserved */ }; /* @@ -609,6 +610,30 @@ } ACPI_PCCT_HW_REDUCED; + +/* 2: HW-reduced Communications Subspace Type 2 (ACPI 6.1) */ + +typedef struct acpi_pcct_hw_reduced_type2 +{ + ACPI_SUBTABLE_HEADER Header; + UINT32 DoorbellInterrupt; + UINT8 Flags; + UINT8 Reserved; + UINT64 BaseAddress; + UINT64 Length; + ACPI_GENERIC_ADDRESS DoorbellRegister; + UINT64 PreserveMask; + UINT64 WriteMask; + UINT32 Latency; + UINT32 MaxAccessRate; + UINT16 MinTurnaroundTime; + ACPI_GENERIC_ADDRESS DoorbellAckRegister; + UINT64 AckPreserveMask; + UINT64 AckWriteMask; + +} ACPI_PCCT_HW_REDUCED_TYPE2; + + /* Values for doorbell flags above */ #define ACPI_PCCT_INTERRUPT_POLARITY (1) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -115,13 +115,25 @@ /* * Common error message prefixes */ +#ifndef ACPI_MSG_ERROR #define ACPI_MSG_ERROR "ACPI Error: " +#endif +#ifndef ACPI_MSG_EXCEPTION #define ACPI_MSG_EXCEPTION "ACPI Exception: " +#endif +#ifndef ACPI_MSG_WARNING #define ACPI_MSG_WARNING "ACPI Warning: " +#endif +#ifndef ACPI_MSG_INFO #define ACPI_MSG_INFO "ACPI: " - +#endif + +#ifndef ACPI_MSG_BIOS_ERROR #define ACPI_MSG_BIOS_ERROR "ACPI BIOS Error (bug): " +#endif +#ifndef ACPI_MSG_BIOS_WARNING #define ACPI_MSG_BIOS_WARNING "ACPI BIOS Warning (bug): " +#endif /* * Common message suffix @@ -175,6 +187,25 @@ /* + * utascii - ASCII utilities + */ +BOOLEAN +AcpiUtValidNameseg ( + char *Signature); + +BOOLEAN +AcpiUtValidNameChar ( + char Character, + UINT32 Position); + +void +AcpiUtCheckAndRepairAscii ( + UINT8 *Name, + char *RepairedName, + UINT32 Count); + + +/* * utnonansi - Non-ANSI C library functions */ void @@ -395,6 +426,14 @@ const char *ModuleName, UINT32 ComponentId, UINT8 *Ptr); + +void +AcpiUtStrExit ( + UINT32 LineNumber, + const char *FunctionName, + const char *ModuleName, + UINT32 ComponentId, + const char *String); void AcpiUtDebugDumpBuffer ( @@ -831,15 +870,6 @@ UtConvertBackslashes ( char *Pathname); #endif - -BOOLEAN -AcpiUtValidAcpiName ( - char *Name); - -BOOLEAN -AcpiUtValidAcpiChar ( - char Character, - UINT32 Position); void AcpiUtRepairName ( Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -163,6 +163,14 @@ #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsGetNextFilename #define ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsCloseDirectory +#define ACPI_MSG_ERROR KERN_ERR "ACPI Error: " +#define ACPI_MSG_EXCEPTION KERN_ERR "ACPI Exception: " +#define ACPI_MSG_WARNING KERN_WARNING "ACPI Warning: " +#define ACPI_MSG_INFO KERN_INFO "ACPI: " + +#define ACPI_MSG_BIOS_ERROR KERN_ERR "ACPI BIOS Error (bug): " +#define ACPI_MSG_BIOS_WARNING KERN_WARNING "ACPI BIOS Warning (bug): " + #else /* !__KERNEL__ */ #include <stdarg.h> Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -116,8 +116,8 @@ continue; } - Status = AcpiNsLookup (NULL, (char *) InitVal->Name, InitVal->Type, - ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, + Status = AcpiNsLookup (NULL, ACPI_CAST_PTR (char, InitVal->Name), + InitVal->Type, ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, NULL, &NewNode); if (ACPI_FAILURE (Status)) { Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -381,7 +381,7 @@ case ACPI_TYPE_STRING: AcpiOsPrintf ("Len %.2X ", ObjDesc->String.Length); - AcpiUtPrintString (ObjDesc->String.Pointer, 32); + AcpiUtPrintString (ObjDesc->String.Pointer, 80); AcpiOsPrintf ("\n"); break; Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -215,7 +215,7 @@ /* * Execute \_SB._INI. - * There appears to be a strict order requirement for \_SB._INI, + * There appears to be a strict order requirement for \_SB._INI, * which should be evaluated before any _REG evaluations. */ Status = AcpiGetHandle (NULL, "\\_SB", &Handle); Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -70,6 +70,12 @@ UINT32 Count2, UINT32 StartIndex); +static ACPI_STATUS +AcpiNsCustomPackage ( + ACPI_EVALUATE_INFO *Info, + ACPI_OPERAND_OBJECT **Elements, + UINT32 Count); + /******************************************************************************* * @@ -148,6 +154,11 @@ */ switch (Package->RetInfo.Type) { + case ACPI_PTYPE_CUSTOM: + + Status = AcpiNsCustomPackage (Info, Elements, Count); + break; + case ACPI_PTYPE1_FIXED: /* * The package count is fixed and there are no subpackages @@ -626,6 +637,92 @@ /******************************************************************************* * + * FUNCTION: AcpiNsCustomPackage + * + * PARAMETERS: Info - Method execution information block + * Elements - Pointer to the package elements array + * Count - Element count for the package + * + * RETURN: Status + * + * DESCRIPTION: Check a returned package object for the correct count and + * correct type of all sub-objects. + * + * NOTE: Currently used for the _BIX method only. When needed for two or more + * methods, probably a detect/dispatch mechanism will be required. + * + ******************************************************************************/ + +static ACPI_STATUS +AcpiNsCustomPackage ( + ACPI_EVALUATE_INFO *Info, + ACPI_OPERAND_OBJECT **Elements, + UINT32 Count) +{ + UINT32 ExpectedCount; + UINT32 Version; + ACPI_STATUS Status = AE_OK; + + + ACPI_FUNCTION_NAME (NsCustomPackage); + + + /* Get version number, must be Integer */ + + if ((*Elements)->Common.Type != ACPI_TYPE_INTEGER) + { + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, + "Return Package has invalid object type for version number")); + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); + } + + Version = (UINT32) (*Elements)->Integer.Value; + ExpectedCount = 21; /* Version 1 */ + + if (Version == 0) + { + ExpectedCount = 20; /* Version 0 */ + } + + if (Count < ExpectedCount) + { + ACPI_WARN_PREDEFINED ((AE_INFO, Info->FullPathname, Info->NodeFlags, + "Return Package is too small - found %u elements, expected %u", + Count, ExpectedCount)); + return_ACPI_STATUS (AE_AML_OPERAND_VALUE); + } + else if (Count > ExpectedCount) + { + ACPI_DEBUG_PRINT ((ACPI_DB_REPAIR, + "%s: Return Package is larger than needed - " + "found %u, expected %u\n", + Info->FullPathname, Count, ExpectedCount)); + } + + /* Validate all elements of the returned package */ + + Status = AcpiNsCheckPackageElements (Info, Elements, + ACPI_RTYPE_INTEGER, 16, + ACPI_RTYPE_STRING, 4, 0); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + + /* Version 1 has a single trailing integer */ + + if (Version > 0) + { + Status = AcpiNsCheckPackageElements (Info, Elements + 20, + ACPI_RTYPE_INTEGER, 1, 0, 0, 20); + } + + return_ACPI_STATUS (Status); +} + + +/******************************************************************************* + * * FUNCTION: AcpiNsCheckPackageElements * * PARAMETERS: Info - Method execution information block Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -305,13 +305,12 @@ } -#if 0 +#ifdef _FUTURE_FEATURE /* * Begin incoming argument count analysis. Check for too few args * and too many args. */ - switch (AcpiNsGetType (Info->Node)) { case ACPI_TYPE_METHOD: @@ -399,68 +398,73 @@ * If we are expecting a return value, and all went well above, * copy the return value to an external object. */ - if (ReturnBuffer) - { - if (!Info->ReturnObject) - { - ReturnBuffer->Length = 0; + if (!ReturnBuffer) + { + goto CleanupReturnObject; + } + + if (!Info->ReturnObject) + { + ReturnBuffer->Length = 0; + goto Cleanup; + } + + if (ACPI_GET_DESCRIPTOR_TYPE (Info->ReturnObject) == + ACPI_DESC_TYPE_NAMED) + { + /* + * If we received a NS Node as a return object, this means that + * the object we are evaluating has nothing interesting to + * return (such as a mutex, etc.) We return an error because + * these types are essentially unsupported by this interface. + * We don't check up front because this makes it easier to add + * support for various types at a later date if necessary. + */ + Status = AE_TYPE; + Info->ReturnObject = NULL; /* No need to delete a NS Node */ + ReturnBuffer->Length = 0; + } + + if (ACPI_FAILURE (Status)) + { + goto CleanupReturnObject; + } + + /* Dereference Index and RefOf references */ + + AcpiNsResolveReferences (Info); + + /* Get the size of the returned object */ + + Status = AcpiUtGetObjectSize (Info->ReturnObject, + &BufferSpaceNeeded); + if (ACPI_SUCCESS (Status)) + { + /* Validate/Allocate/Clear caller buffer */ + + Status = AcpiUtInitializeBuffer (ReturnBuffer, + BufferSpaceNeeded); + if (ACPI_FAILURE (Status)) + { + /* + * Caller's buffer is too small or a new one can't + * be allocated + */ + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, + "Needed buffer size %X, %s\n", + (UINT32) BufferSpaceNeeded, + AcpiFormatException (Status))); } else { - if (ACPI_GET_DESCRIPTOR_TYPE (Info->ReturnObject) == - ACPI_DESC_TYPE_NAMED) - { - /* - * If we received a NS Node as a return object, this means that - * the object we are evaluating has nothing interesting to - * return (such as a mutex, etc.) We return an error because - * these types are essentially unsupported by this interface. - * We don't check up front because this makes it easier to add - * support for various types at a later date if necessary. - */ - Status = AE_TYPE; - Info->ReturnObject = NULL; /* No need to delete a NS Node */ - ReturnBuffer->Length = 0; - } - - if (ACPI_SUCCESS (Status)) - { - /* Dereference Index and RefOf references */ - - AcpiNsResolveReferences (Info); - - /* Get the size of the returned object */ - - Status = AcpiUtGetObjectSize (Info->ReturnObject, - &BufferSpaceNeeded); - if (ACPI_SUCCESS (Status)) - { - /* Validate/Allocate/Clear caller buffer */ - - Status = AcpiUtInitializeBuffer (ReturnBuffer, - BufferSpaceNeeded); - if (ACPI_FAILURE (Status)) - { - /* - * Caller's buffer is too small or a new one can't - * be allocated - */ - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Needed buffer size %X, %s\n", - (UINT32) BufferSpaceNeeded, - AcpiFormatException (Status))); - } - else - { - /* We have enough space for the object, build it */ - - Status = AcpiUtCopyIobjectToEobject ( - Info->ReturnObject, ReturnBuffer); - } - } - } - } - } + /* We have enough space for the object, build it */ + + Status = AcpiUtCopyIobjectToEobject ( + Info->ReturnObject, ReturnBuffer); + } + } + +CleanupReturnObject: if (Info->ReturnObject) { Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -148,7 +148,7 @@ } else if (OpInfo->Flags & AML_NAMED) { - Flags = ACPI_PARSEOP_NAMED; + Flags = ACPI_PARSEOP_NAMED_OBJECT; } else if (Opcode == AML_INT_BYTELIST_OP) { Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/resources/rsdumpinfo.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -265,19 +265,20 @@ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (CommonSerialBus.Type), "Type", AcpiGbl_SbtDecode}, \ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (CommonSerialBus.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, \ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (CommonSerialBus.SlaveMode), "SlaveMode", AcpiGbl_SmDecode}, \ + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (CommonSerialBus.ConnectionSharing),"ConnectionSharing", AcpiGbl_ShrDecode}, \ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (CommonSerialBus.TypeRevisionId), "TypeRevisionId", NULL}, \ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (CommonSerialBus.TypeDataLength), "TypeDataLength", NULL}, \ {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (CommonSerialBus.ResourceSource), "ResourceSource", NULL}, \ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (CommonSerialBus.VendorLength), "VendorLength", NULL}, \ {ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (CommonSerialBus.VendorData), "VendorData", NULL}, -ACPI_RSDUMP_INFO AcpiRsDumpCommonSerialBus[10] = +ACPI_RSDUMP_INFO AcpiRsDumpCommonSerialBus[11] = { {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpCommonSerialBus), "Common Serial Bus", NULL}, ACPI_RS_DUMP_COMMON_SERIAL_BUS }; -ACPI_RSDUMP_INFO AcpiRsDumpI2cSerialBus[13] = +ACPI_RSDUMP_INFO AcpiRsDumpI2cSerialBus[14] = { {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpI2cSerialBus), "I2C Serial Bus", NULL}, ACPI_RS_DUMP_COMMON_SERIAL_BUS @@ -286,7 +287,7 @@ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (I2cSerialBus.SlaveAddress), "SlaveAddress", NULL}, }; -ACPI_RSDUMP_INFO AcpiRsDumpSpiSerialBus[17] = +ACPI_RSDUMP_INFO AcpiRsDumpSpiSerialBus[18] = { {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpSpiSerialBus), "Spi Serial Bus", NULL}, ACPI_RS_DUMP_COMMON_SERIAL_BUS @@ -299,7 +300,7 @@ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (SpiSerialBus.ConnectionSpeed), "ConnectionSpeed", NULL}, }; -ACPI_RSDUMP_INFO AcpiRsDumpUartSerialBus[19] = +ACPI_RSDUMP_INFO AcpiRsDumpUartSerialBus[20] = { {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpUartSerialBus), "Uart Serial Bus", NULL}, ACPI_RS_DUMP_COMMON_SERIAL_BUS Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/resources/rsserial.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -153,7 +153,7 @@ * ******************************************************************************/ -ACPI_RSCONVERT_INFO AcpiRsConvertI2cSerialBus[16] = +ACPI_RSCONVERT_INFO AcpiRsConvertI2cSerialBus[17] = { {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ACPI_RS_SIZE (ACPI_RESOURCE_I2C_SERIALBUS), @@ -179,6 +179,10 @@ AML_OFFSET (CommonSerialBus.Flags), 1}, + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.CommonSerialBus.ConnectionSharing), + AML_OFFSET (CommonSerialBus.Flags), + 2}, + {ACPI_RSC_MOVE8, ACPI_RS_OFFSET (Data.CommonSerialBus.TypeRevisionId), AML_OFFSET (CommonSerialBus.TypeRevisionId), 1}, @@ -233,7 +237,7 @@ * ******************************************************************************/ -ACPI_RSCONVERT_INFO AcpiRsConvertSpiSerialBus[20] = +ACPI_RSCONVERT_INFO AcpiRsConvertSpiSerialBus[21] = { {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ACPI_RS_SIZE (ACPI_RESOURCE_SPI_SERIALBUS), @@ -259,6 +263,10 @@ AML_OFFSET (CommonSerialBus.Flags), 1}, + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.CommonSerialBus.ConnectionSharing), + AML_OFFSET (CommonSerialBus.Flags), + 2}, + {ACPI_RSC_MOVE8, ACPI_RS_OFFSET (Data.CommonSerialBus.TypeRevisionId), AML_OFFSET (CommonSerialBus.TypeRevisionId), 1}, @@ -329,7 +337,7 @@ * ******************************************************************************/ -ACPI_RSCONVERT_INFO AcpiRsConvertUartSerialBus[22] = +ACPI_RSCONVERT_INFO AcpiRsConvertUartSerialBus[23] = { {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ACPI_RS_SIZE (ACPI_RESOURCE_UART_SERIALBUS), @@ -355,6 +363,10 @@ AML_OFFSET (CommonSerialBus.Flags), 1}, + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.CommonSerialBus.ConnectionSharing), + AML_OFFSET (CommonSerialBus.Flags), + 2}, + {ACPI_RSC_MOVE8, ACPI_RS_OFFSET (Data.CommonSerialBus.TypeRevisionId), AML_OFFSET (CommonSerialBus.TypeRevisionId), 1}, Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -441,7 +441,7 @@ ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, "%4.4s 0x%8.8X%8.8X" " Attempted table install failed", - AcpiUtValidAcpiName (TableDesc->Signature.Ascii) ? + AcpiUtValidNameseg (TableDesc->Signature.Ascii) ? TableDesc->Signature.Ascii : "????", ACPI_FORMAT_UINT64 (TableDesc->Address))); Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -83,7 +83,7 @@ /* Validate the input table signature */ - if (!AcpiIsValidSignature (Signature)) + if (!AcpiUtValidNameseg (Signature)) { return_ACPI_STATUS (AE_BAD_SIGNATURE); } Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -326,7 +326,7 @@ ACPI_BIOS_ERROR ((AE_INFO, "Table has invalid signature [%4.4s] (0x%8.8X), " "must be SSDT or OEMx", - AcpiUtValidAcpiName (NewTableDesc.Signature.Ascii) ? + AcpiUtValidNameseg (NewTableDesc.Signature.Ascii) ? NewTableDesc.Signature.Ascii : "????", NewTableDesc.Signature.Integer)); Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -411,36 +411,3 @@ AcpiOsUnmapMemory (Table, Length); return_ACPI_STATUS (AE_OK); } - - -/******************************************************************************* - * - * FUNCTION: AcpiIsValidSignature - * - * PARAMETERS: Signature - Sig string to be validated - * - * RETURN: TRUE if signature is has 4 valid ACPI characters - * - * DESCRIPTION: Validate an ACPI table signature. - * - ******************************************************************************/ - -BOOLEAN -AcpiIsValidSignature ( - char *Signature) -{ - UINT32 i; - - - /* Validate each character in the signature */ - - for (i = 0; i < ACPI_NAME_SIZE; i++) - { - if (!AcpiUtValidAcpiChar (Signature[i], i)) - { - return (FALSE); - } - } - - return (TRUE); -} Added: trunk/reactos/drivers/bus/acpi/acpica/utilities/utascii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utascii.c (added) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utascii.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -0,0 +1,161 @@ +/****************************************************************************** + * + * Module Name: utascii - Utility ascii functions + * + *****************************************************************************/ + +/* + * Copyright (C) 2000 - 2016, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#include "acpi.h" +#include "accommon.h" + + +/******************************************************************************* + * + * FUNCTION: AcpiUtValidNameseg + * + * PARAMETERS: Name - The name or table signature to be examined. + * Four characters, does not have to be a + * NULL terminated string. + * + * RETURN: TRUE if signature is has 4 valid ACPI characters + * + * DESCRIPTION: Validate an ACPI table signature. + * + ******************************************************************************/ + +BOOLEAN +AcpiUtValidNameseg ( + char *Name) +{ + UINT32 i; + + + /* Validate each character in the signature */ + + for (i = 0; i < ACPI_NAME_SIZE; i++) + { + if (!AcpiUtValidNameChar (Name[i], i)) + { + return (FALSE); + } + } + + return (TRUE); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiUtValidNameChar + * + * PARAMETERS: Char - The character to be examined + * Position - Byte position (0-3) + * + * RETURN: TRUE if the character is valid, FALSE otherwise + * + * DESCRIPTION: Check for a valid ACPI character. Must be one of: + * 1) Upper case alpha + * 2) numeric + * 3) underscore + * + * We allow a '!' as the last character because of the ASF! table + * + ******************************************************************************/ + +BOOLEAN +AcpiUtValidNameChar ( + char Character, + UINT32 Position) +{ + + if (!((Character >= 'A' && Character <= 'Z') || + (Character >= '0' && Character <= '9') || + (Character == '_'))) + { + /* Allow a '!' in the last position */ + + if (Character == '!' && Position == 3) + { + return (TRUE); + } + + return (FALSE); + } + + return (TRUE); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiUtCheckAndRepairAscii + * + * PARAMETERS: Name - Ascii string + * Count - Number of characters to check + * + * RETURN: None + * + * DESCRIPTION: Ensure that the requested number of characters are printable + * Ascii characters. Sets non-printable and null chars to <space>. + * + ******************************************************************************/ + +void +AcpiUtCheckAndRepairAscii ( + UINT8 *Name, + char *RepairedName, + UINT32 Count) +{ + UINT32 i; + + + for (i = 0; i < Count; i++) + { + RepairedName[i] = (char) Name[i]; + + if (!Name[i]) + { + return; + } + if (!isprint (Name[i])) + { + RepairedName[i] = ' '; + } + } +} Propchange: trunk/reactos/drivers/bus/acpi/acpica/utilities/utascii.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utclib.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -107,6 +107,7 @@ * DESCRIPTION: Compare two Buffers, with a maximum length * ******************************************************************************/ + int memcmp ( void *VBuffer1, Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utdebug.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -632,6 +632,48 @@ /******************************************************************************* * + * FUNCTION: AcpiUtStrExit + * + * PARAMETERS: LineNumber - Caller's line number + * FunctionName - Caller's procedure name + * ModuleName - Caller's module name + * ComponentId - Caller's component ID + * String - String to display + * + * RETURN: None + * + * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is + * set in DebugLevel. Prints exit value also. + * + ******************************************************************************/ + +void +AcpiUtStrExit ( + UINT32 LineNumber, + const char *FunctionName, + const char *ModuleName, + UINT32 ComponentId, + const char *String) +{ + + /* Check if enabled up-front for performance */ + + if (ACPI_IS_DEBUG_ENABLED (ACPI_LV_FUNCTIONS, ComponentId)) + { + AcpiDebugPrint (ACPI_LV_FUNCTIONS, + LineNumber, FunctionName, ModuleName, ComponentId, + "%s %s\n", AcpiGbl_FunctionExitPrefix, String); + } + + if (AcpiGbl_NestingLevel) + { + AcpiGbl_NestingLevel--; + } +} + + +/******************************************************************************* + * * FUNCTION: AcpiTracePoint * * PARAMETERS: Type - Trace event type Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -284,7 +284,7 @@ return_PTR ("Invalid object"); } - return_PTR (AcpiUtGetTypeName (ObjDesc->Common.Type)); + return_STR (AcpiUtGetTypeName (ObjDesc->Common.Type)); } Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c [iso-8859-1] Sat Feb 25 20:06:05 2017 @@ -159,86 +159,6 @@ /******************************************************************************* * - * FUNCTION: AcpiUtValidAcpiChar - * - * PARAMETERS: Char - The character to be examined - * Position - Byte position (0-3) - * - * RETURN: TRUE if the character is valid, FALSE otherwise - * - * DESCRIPTION: Check for a valid ACPI character. Must be one of: - * 1) Upper case alpha - * 2) numeric - * 3) underscore - * - * We allow a '!' as the last character because of the ASF! table - * - ******************************************************************************/ - -BOOLEAN -AcpiUtValidAcpiChar ( - char Character, - UINT32 Position) -{ - - if (!((Character >= 'A' && Character <= 'Z') || - (Character >= '0' && Character <= '9') || - (Character == '_'))) - { - /* Allow a '!' in the last position */ - - if (Character == '!' && Position == 3) - { - return (TRUE); - } - - return (FALSE); - } - - return (TRUE); -} - - -/******************************************************************************* - * - * FUNCTION: AcpiUtValidAcpiName - * - * PARAMETERS: Name - The name to be examined. Does not have to - * be NULL terminated string. - * - * RETURN: TRUE if the name is valid, FALSE otherwise - * - * DESCRIPTION: Check for a valid ACPI name. Each character must be one of: - * 1) Upper case alpha - * 2) numeric - * 3) underscore - * - ******************************************************************************/ - -BOOLEAN -AcpiUtValidAcpiName ( - char *Name) -{ - UINT32 i; - - - ACPI_FUNCTION_ENTRY (); - - - for (i = 0; i < ACPI_NAME_SIZE; i++) - { - if (!AcpiUtValidAcpiChar (Name[i], i)) - { - return (FALSE); - } - } - - return (TRUE); -} - - -/******************************************************************************* - * * FUNCTION: AcpiUtRepairName * * PARAMETERS: Name - The ACPI name to be repaired @@ -286,7 +206,7 @@ for (i = 0; i < ACPI_NAME_SIZE; i++) { - if (AcpiUtValidAcpiChar (Name[i], i)) + if (AcpiUtValidNameChar (Name[i], i)) { continue; }

1 0

[dreimer] 73908: [RAPPS] Add Samba to RAPPS CORE-12601 #comment Added to RAPPS as asked for.
by dreimer＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: dreimer Date: Sat Feb 25 15:14:54 2017 New Revision: 73908 URL: http://svn.reactos.org/svn/reactos?rev=73908&view=rev Log: [RAPPS] Add Samba to RAPPS CORE-12601 #comment Added to RAPPS as asked for. Added: trunk/reactos/media/rapps/samba.txt (with props) Added: trunk/reactos/media/rapps/samba.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/samba.txt?rev=… ============================================================================== --- trunk/reactos/media/rapps/samba.txt (added) +++ trunk/reactos/media/rapps/samba.txt [iso-8859-1] Sat Feb 25 15:14:54 2017 @@ -0,0 +1,16 @@ +[Section] +Name = Samba +Version = 1.3 +License = GPLv3 +Description = Provides authentication providers for secur32.dll (e.g. NTLM ...) needed for running applications. +Size = 10.8 MiB +Category = 5 +URLSite = http://samba.org/ +URLDownload = http://svn.reactos.org/packages/samba-for-ReactOSv1.3.exe +SHA1 = 85e670da4700dbfe93e8460a43f6aeafee6fd1fd +CDPath = none + +[Section.0407] +Description = Liefert Authentifizierungsanbieter fÃ¼r secur32.dll (wie NTLM ...) die fÃ¼r einige Anwendungen benÃ¶tigt werden. +Size = 10,8 MiB + Propchange: trunk/reactos/media/rapps/samba.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF

1 0

[gadamopoulos] 73907: [COMCTL32] -Reduce diff with user32 and move all data of the button in a single struct.
by gadamopoulos＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: gadamopoulos Date: Sat Feb 25 14:56:44 2017 New Revision: 73907 URL: http://svn.reactos.org/svn/reactos?rev=73907&view=rev Log: [COMCTL32] -Reduce diff with user32 and move all data of the button in a single struct. Modified: trunk/reactos/dll/win32/comctl32/button.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sat Feb 25 14:56:44 2017 @@ -155,7 +155,6 @@ IDC_ARROW, /* cursor */ 0 /* brush */ }; -#endif static inline LONG get_button_state( HWND hwnd ) @@ -182,8 +181,40 @@ #endif /* __REACTOS__ */ -#ifndef _USER32_ +static inline HFONT get_button_font( HWND hwnd ) +{ + return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); +} + +static inline void set_button_font( HWND hwnd, HFONT font ) +{ + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG_PTR)font ); +} + +static inline UINT get_button_type( LONG window_style ) +{ + return (window_style & BS_TYPEMASK); +} + +/* paint a button of any type */ +static inline void paint_button( HWND hwnd, LONG style, UINT action ) +{ + if (btnPaintFunc[style] && IsWindowVisible(hwnd)) + { + HDC hdc = GetDC( hwnd ); + btnPaintFunc[style]( hwnd, hdc, action ); + ReleaseDC( hwnd, hdc ); + } +} + +#else + #define NtUserAlterWindowStyle SetWindowLongPtrW + +static inline void _SetButtonData(HWND hwnd, PBUTTON_DATA data) +{ + SetWindowLongPtrW( hwnd, 0, (LONG)data ); +} HRGN set_control_clipping( HDC hdc, const RECT *rect ) { @@ -209,24 +240,45 @@ static inline LONG_PTR get_button_image(HWND hwnd) { - return GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); + return _GetButtonData(hwnd)->image; } static inline LONG_PTR set_button_image(HWND hwnd, LONG_PTR image) { - return SetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET, image ); -} - -#endif + PBUTTON_DATA data = _GetButtonData(hwnd); + LONG_PTR ret = data->image; + data->image = image; + return ret; +} + +static inline LONG get_button_state( HWND hwnd ) +{ + return _GetButtonData(hwnd)->state; +} + +static inline void set_button_state( HWND hwnd, LONG state ) +{ + _GetButtonData(hwnd)->state = state; +} + +static __inline void set_ui_state( HWND hwnd, LONG flags ) +{ + _GetButtonData(hwnd)->ui_state = flags; +} + +static __inline LONG get_ui_state( HWND hwnd ) +{ + return _GetButtonData(hwnd)->ui_state; +} static inline HFONT get_button_font( HWND hwnd ) { - return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (HFONT)_GetButtonData(hwnd)->font; } static inline void set_button_font( HWND hwnd, HFONT font ) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG_PTR)font ); + _GetButtonData(hwnd)->font = font; } static inline UINT get_button_type( LONG window_style ) @@ -237,7 +289,6 @@ /* paint a button of any type */ static inline void paint_button( HWND hwnd, LONG style, UINT action ) { -#ifndef _USER32_ HTHEME theme = GetWindowTheme(hwnd); RECT rc; HDC hdc = GetDC( hwnd ); @@ -254,15 +305,10 @@ btnPaintFunc[style]( hwnd, hdc, action ); } ReleaseDC( hwnd, hdc ); -#else - if (btnPaintFunc[style] && IsWindowVisible(hwnd)) - { - HDC hdc = GetDC( hwnd ); - btnPaintFunc[style]( hwnd, hdc, action ); - ReleaseDC( hwnd, hdc ); - } -#endif -} +} + +#endif + /* retrieve the button text; returned buffer must be freed by caller */ static inline WCHAR *get_button_text( HWND hwnd ) @@ -336,6 +382,83 @@ pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); +#ifndef _USER32_ + switch (uMsg) + { + case WM_NCCREATE: + { + PBUTTON_DATA data = HeapAlloc( GetProcessHeap(), 0, sizeof(BUTTON_DATA) ); + if (!data) + { + ERR("Failed to alloc internal button data\n"); + return -1; + } + + memset(data, 0, sizeof(BUTTON_DATA)); + _SetButtonData(hWnd, data); + break; + } + case WM_NCDESTROY: + { + PBUTTON_DATA data = _GetButtonData(hWnd); + if (!data) + { + ERR("No data"); + return 0; + } + HeapFree( GetProcessHeap(), 0, data ); + _SetButtonData(hWnd, NULL); + } + case WM_CREATE: + OpenThemeData(hWnd, WC_BUTTONW); + break; + case WM_DESTROY: + CloseThemeData (GetWindowTheme(hWnd)); + break; + case WM_THEMECHANGED: + CloseThemeData (GetWindowTheme(hWnd)); + OpenThemeData(hWnd, WC_BUTTONW); + InvalidateRect(hWnd, NULL, FALSE); + break; + case WM_MOUSEHOVER: + { + int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); + set_button_state(hWnd, state|BST_HOT); + InvalidateRect(hWnd, NULL, FALSE); + break; + } + case WM_MOUSELEAVE: + { + int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); + set_button_state(hWnd, state&(~BST_HOT)); + InvalidateRect(hWnd, NULL, FALSE); + break; + } + case WM_MOUSEMOVE: + { + TRACKMOUSEEVENT mouse_event; + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hWnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + break; + } + } + + if (!_GetButtonData(hWnd)) + { + ERR("no data!\n"); + return unicode ? DefWindowProcW(hWnd, uMsg, wParam, lParam) : + DefWindowProcA(hWnd, uMsg, wParam, lParam); + } + +#endif + switch (uMsg) { case WM_GETDLGCODE: @@ -372,9 +495,6 @@ #ifdef __REACTOS__ button_update_uistate( hWnd, unicode ); #endif -#ifndef _USER32_ - OpenThemeData(hWnd, WC_BUTTONW); -#endif return 0; #if defined(__REACTOS__) && defined(_USER32_) @@ -382,32 +502,6 @@ NtUserSetWindowFNID(hWnd, FNID_DESTROY); case WM_DESTROY: break; -#endif -#ifndef _USER32_ - case WM_DESTROY: - CloseThemeData (GetWindowTheme(hWnd)); - break; - case WM_THEMECHANGED: - CloseThemeData (GetWindowTheme(hWnd)); - OpenThemeData(hWnd, WC_BUTTONW); - InvalidateRect(hWnd, NULL, FALSE); - break; - - case WM_MOUSEHOVER: - { - int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); - SetWindowLongW(hWnd, 0, state|BST_HOT); - InvalidateRect(hWnd, NULL, FALSE); - break; - } - - case WM_MOUSELEAVE: - { - int state = (int)SendMessageW(hWnd, BM_GETSTATE, 0, 0); - SetWindowLongW(hWnd, 0, state&(~BST_HOT)); - InvalidateRect(hWnd, NULL, FALSE); - break; - } #endif case WM_ERASEBKGND: if (btn_type == BS_OWNERDRAW) @@ -545,21 +639,6 @@ break; case WM_MOUSEMOVE: -#ifndef _USER32_ - { - TRACKMOUSEEVENT mouse_event; - mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); - mouse_event.dwFlags = TME_QUERY; - if(!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags&(TME_HOVER|TME_LEAVE))) - { - mouse_event.dwFlags = TME_HOVER|TME_LEAVE; - mouse_event.hwndTrack = hWnd; - mouse_event.dwHoverTime = 1; - TrackMouseEvent(&mouse_event); - } - } -#endif - if ((wParam & MK_LBUTTON) && GetCapture() == hWnd) { GetClientRect( hWnd, &rect ); @@ -637,10 +716,12 @@ case WM_SETFOCUS: TRACE("WM_SETFOCUS %p\n",hWnd); set_button_state( hWnd, get_button_state(hWnd) | BST_FOCUS ); - if (btn_type == BS_OWNERDRAW) - paint_button( hWnd, btn_type, ODA_FOCUS ); +#ifndef _USER32_ + if (btn_type != BS_OWNERDRAW) + InvalidateRect(hWnd, NULL, FALSE); else - InvalidateRect(hWnd, NULL, FALSE); +#endif + paint_button( hWnd, btn_type, ODA_FOCUS ); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; @@ -649,6 +730,9 @@ TRACE("WM_KILLFOCUS %p\n",hWnd); state = get_button_state( hWnd ); set_button_state( hWnd, state & ~BST_FOCUS ); +#ifdef _USER32_ + paint_button( hWnd, btn_type, ODA_FOCUS ); +#endif if ((state & BUTTON_BTNPRESSED) && GetCapture() == hWnd) ReleaseCapture(); @@ -742,7 +826,11 @@ if ((state & 3) != wParam) { set_button_state( hWnd, (state & ~3) | wParam ); +#ifdef _USER32 + paint_button( hWnd, btn_type, ODA_SELECT ); +#else InvalidateRect(hWnd, NULL, FALSE); +#endif } if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); @@ -758,7 +846,11 @@ else set_button_state( hWnd, state & ~BST_PUSHED ); +#ifdef _USER32_ + paint_button( hWnd, btn_type, ODA_SELECT ); +#else InvalidateRect(hWnd, NULL, FALSE); +#endif break; #ifdef __REACTOS__ @@ -1495,7 +1587,7 @@ wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC; wndClass.lpfnWndProc = ButtonWndProcW; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = NB_EXTRA_BYTES; + wndClass.cbWndExtra = sizeof(PBUTTON_DATA); wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wndClass.lpszClassName = WC_BUTTONW; Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Sat Feb 25 14:56:44 2017 @@ -75,6 +75,18 @@ } COMCTL32_SysColor; extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; + +typedef struct _BUTTON_DATA { + LONG state; + HFONT font; + LONG_PTR image; + DWORD ui_state; +} BUTTON_DATA, *PBUTTON_DATA; + +static inline PBUTTON_DATA _GetButtonData(HWND hwnd) +{ + return (PBUTTON_DATA)GetWindowLongPtrW( hwnd, 0 ); +} /* Internal function */ HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Sat Feb 25 14:56:44 2017 @@ -36,18 +36,19 @@ typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag); -#define STATE_GWL_OFFSET 0 -#define HFONT_GWL_OFFSET (sizeof(LONG)) -#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) - static inline LONG get_button_state( HWND hwnd ) { - return GetWindowLongPtrW( hwnd, STATE_GWL_OFFSET ); + return _GetButtonData(hwnd)->state; } static inline HFONT get_button_font( HWND hwnd ) { - return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (HFONT)_GetButtonData(hwnd)->font; +} + +static inline LONG_PTR get_button_image(HWND hwnd) +{ + return _GetButtonData(hwnd)->image; } static UINT get_drawtext_flags(DWORD style, DWORD ex_style) @@ -333,7 +334,7 @@ if (!paint) return FALSE; - if (GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET) != 0) + if (get_button_image(hwnd) != 0) return FALSE; dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE);

1 0

[mjansen] 73906: [OLE32] Fix a crash when executing zz_winrar_3.80_test.exe 4.drag_and_drop CORE-12590 #resolve
by mjansen＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: mjansen Date: Sat Feb 25 14:52:16 2017 New Revision: 73906 URL: http://svn.reactos.org/svn/reactos?rev=73906&view=rev Log: [OLE32] Fix a crash when executing zz_winrar_3.80_test.exe 4.drag_and_drop CORE-12590 #resolve Modified: trunk/reactos/dll/win32/ole32/clipboard.c Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Sat Feb 25 14:52:16 2017 @@ -807,6 +807,9 @@ mem_fmt = *fmt; mem_fmt.tymed = TYMED_HGLOBAL; +#ifdef __REACTOS__ + med.pUnkForRelease = NULL; +#endif hr = IDataObject_GetData(data, &mem_fmt, &med); if(FAILED(hr)) return hr;

1 0

[tfaber] 73905: [KERNEL32] - Avoid leaving lpRootPath initialized in GetDriveTypeW. Powered by /RTC1
by tfaber＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: tfaber Date: Sat Feb 25 13:06:25 2017 New Revision: 73905 URL: http://svn.reactos.org/svn/reactos?rev=73905&view=rev Log: [KERNEL32] - Avoid leaving lpRootPath initialized in GetDriveTypeW. Powered by /RTC1 Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c Modified: trunk/reactos/dll/win32/kernel32/client/file/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/disk.c [iso-8859-1] Sat Feb 25 13:06:25 2017 @@ -411,6 +411,7 @@ TRACE("lpRootPathName: %S\n", lpRootPathName); + lpRootPath = lpRootPathName; if (Length == 2) { WCHAR DriveLetter = RtlUpcaseUnicodeChar(lpRootPathName[0]); @@ -427,10 +428,6 @@ lpRootPath = CurrentDir; } - } - else - { - lpRootPath = lpRootPathName; } }

1 0

[ekohl] 73904: [SETUPAPI] - Implement CM_Get_Class_Registry_PropertyA(). - Move mapping of poperty type to registry value type into a separate function and use it in CM_Get_Class_Registry_PropertyA...
by ekohl＠svn.reactos.org 25 Feb '17

25 Feb '17

Author: ekohl Date: Sat Feb 25 12:45:05 2017 New Revision: 73904 URL: http://svn.reactos.org/svn/reactos?rev=73904&view=rev Log: [SETUPAPI] - Implement CM_Get_Class_Registry_PropertyA(). - Move mapping of poperty type to registry value type into a separate function and use it in CM_Get_Class_Registry_PropertyA(), CM_Set_DevNode_Registry_Property_ExA() and CM_Set_DevNode_Registry_Property_ExW(). Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Feb 25 12:45:05 2017 @@ -95,6 +95,59 @@ } +static +ULONG +GetRegistryPropertyType( + ULONG ulProperty) +{ + switch (ulProperty) + { + case CM_DRP_DEVICEDESC: + case CM_DRP_SERVICE: + case CM_DRP_CLASS: + case CM_DRP_CLASSGUID: + case CM_DRP_DRIVER: + case CM_DRP_MFG: + case CM_DRP_FRIENDLYNAME: + case CM_DRP_LOCATION_INFORMATION: + case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: + case CM_DRP_ENUMERATOR_NAME: + case CM_DRP_SECURITY_SDS: + case CM_DRP_UI_NUMBER_DESC_FORMAT: + return REG_SZ; + + case CM_DRP_HARDWAREID: + case CM_DRP_COMPATIBLEIDS: + case CM_DRP_UPPERFILTERS: + case CM_DRP_LOWERFILTERS: + return REG_MULTI_SZ; + + case CM_DRP_CONFIGFLAGS: + case CM_DRP_CAPABILITIES: + case CM_DRP_UI_NUMBER: + case CM_DRP_LEGACYBUSTYPE: + case CM_DRP_BUSNUMBER: + case CM_DRP_DEVTYPE: + case CM_DRP_EXCLUSIVE: + case CM_DRP_CHARACTERISTICS: + case CM_DRP_ADDRESS: + case CM_DRP_REMOVAL_POLICY: + case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: + case CM_DRP_REMOVAL_POLICY_OVERRIDE: + case CM_DRP_INSTALL_STATE: + return REG_DWORD; + + case CM_DRP_BUSTYPEGUID: + case CM_DRP_SECURITY: + case CM_DRP_DEVICE_POWER_DATA: + default: + return REG_BINARY; + } + + return REG_NONE; +} + + /*********************************************************************** * CMP_Init_Detection [SETUPAPI.@] */ @@ -1689,10 +1742,68 @@ LPGUID ClassGuid, ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %lu %p %p %p %lx %lx\n", + PWSTR BufferW = NULL; + ULONG ulLength = 0; + ULONG ulType; + CONFIGRET ret; + + TRACE("%p %lu %p %p %p %lx %lx\n", ClassGuid, ulProperty, pulRegDataType, Buffer, pulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + + if (pulLength == NULL) + return CR_INVALID_POINTER; + + if (ulProperty < CM_CRP_MIN || ulProperty > CM_CRP_MAX) + return CR_INVALID_PROPERTY; + + ulType = GetRegistryPropertyType(ulProperty); + if (ulType == REG_SZ || ulType == REG_MULTI_SZ) + { + /* Get the required buffer size */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + NULL, &ulLength, ulFlags, hMachine); + if (ret != CR_BUFFER_SMALL) + return ret; + + /* Allocate the unicode buffer */ + BufferW = HeapAlloc(GetProcessHeap(), 0, ulLength); + if (BufferW == NULL) + return CR_OUT_OF_MEMORY; + + /* Get the property */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + BufferW, &ulLength, ulFlags, hMachine); + if (ret != CR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, BufferW); + return ret; + } + + /* Do W->A conversion */ + *pulLength = WideCharToMultiByte(CP_ACP, + 0, + BufferW, + lstrlenW(BufferW) + 1, + Buffer, + *pulLength, + NULL, + NULL); + + /* Release the unicode buffer */ + HeapFree(GetProcessHeap(), 0, BufferW); + + if (*pulLength == 0) + ret = CR_FAILURE; + } + else + { + /* Get the property */ + ret = CM_Get_Class_Registry_PropertyW(ClassGuid, ulProperty, pulRegDataType, + Buffer, pulLength, ulFlags, hMachine); + } + + return ret; } @@ -5435,6 +5546,9 @@ if (Buffer == NULL && ulLength != 0) return CR_INVALID_POINTER; + if (ulProperty < CM_DRP_MIN || ulProperty > CM_DRP_MAX) + return CR_INVALID_PROPERTY; + if (Buffer == NULL) { ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, @@ -5447,87 +5561,7 @@ else { /* Get property type */ - switch (ulProperty) - { - case CM_DRP_DEVICEDESC: - ulType = REG_SZ; - break; - - case CM_DRP_HARDWAREID: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_COMPATIBLEIDS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SERVICE: - ulType = REG_SZ; - break; - - case CM_DRP_CLASS: - ulType = REG_SZ; - break; - - case CM_DRP_CLASSGUID: - ulType = REG_SZ; - break; - - case CM_DRP_DRIVER: - ulType = REG_SZ; - break; - - case CM_DRP_CONFIGFLAGS: - ulType = REG_DWORD; - break; - - case CM_DRP_MFG: - ulType = REG_SZ; - break; - - case CM_DRP_FRIENDLYNAME: - ulType = REG_SZ; - break; - - case CM_DRP_LOCATION_INFORMATION: - ulType = REG_SZ; - break; - - case CM_DRP_UPPERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_LOWERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SECURITY: - ulType = REG_BINARY; - break; - - case CM_DRP_DEVTYPE: - ulType = REG_DWORD; - break; - - case CM_DRP_EXCLUSIVE: - ulType = REG_DWORD; - break; - - case CM_DRP_CHARACTERISTICS: - ulType = REG_DWORD; - break; - - case CM_DRP_UI_NUMBER_DESC_FORMAT: - ulType = REG_SZ; - break; - - case CM_DRP_REMOVAL_POLICY_OVERRIDE: - ulType = REG_DWORD; - break; - - default: - return CR_INVALID_PROPERTY; - } + ulType = GetRegistryPropertyType(ulProperty); /* Allocate buffer if needed */ if (ulType == REG_SZ || @@ -5623,87 +5657,8 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - switch (ulProperty) - { - case CM_DRP_DEVICEDESC: - ulType = REG_SZ; - break; - - case CM_DRP_HARDWAREID: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_COMPATIBLEIDS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SERVICE: - ulType = REG_SZ; - break; - - case CM_DRP_CLASS: - ulType = REG_SZ; - break; - - case CM_DRP_CLASSGUID: - ulType = REG_SZ; - break; - - case CM_DRP_DRIVER: - ulType = REG_SZ; - break; - - case CM_DRP_CONFIGFLAGS: - ulType = REG_DWORD; - break; - - case CM_DRP_MFG: - ulType = REG_SZ; - break; - - case CM_DRP_FRIENDLYNAME: - ulType = REG_SZ; - break; - - case CM_DRP_LOCATION_INFORMATION: - ulType = REG_SZ; - break; - - case CM_DRP_UPPERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_LOWERFILTERS: - ulType = REG_MULTI_SZ; - break; - - case CM_DRP_SECURITY: - ulType = REG_BINARY; - break; - - case CM_DRP_DEVTYPE: - ulType = REG_DWORD; - break; - - case CM_DRP_EXCLUSIVE: - ulType = REG_DWORD; - break; - - case CM_DRP_CHARACTERISTICS: - ulType = REG_DWORD; - break; - - case CM_DRP_UI_NUMBER_DESC_FORMAT: - ulType = REG_SZ; - break; - - case CM_DRP_REMOVAL_POLICY_OVERRIDE: - ulType = REG_DWORD; - break; - - default: - return CR_INVALID_PROPERTY; - } + /* Get property type */ + ulType = GetRegistryPropertyType(ulProperty); RpcTryExcept {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs