Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[ashaposhnikov] 75334: [RAPPS] Showing info from Languages sectin - Created dummies & added new string resources - lang/uk-UA.rc: translated all strings - crichedit.h: safe text add

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Jul 13 22:01:02 2017 New Revision: 75334 URL: http://svn.reactos.org/svn/reactos?rev=75334&view=rev Log: [RAPPS] Showing info from Languages sectin - Created dummies & added new string resources - lang/uk-UA.rc: translated all strings - crichedit.h: safe text add Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Jul 13 22:01:02 2017 @@ -111,6 +111,16 @@ //TODO: make the actual check return TRUE; } +BOOL +HasEnglishLanguage(PAPPLICATION_INFO Info) +{ + if (!Info) + { + return FALSE; + } + //TODO: make the actual check + return TRUE; +} LICENSE_TYPE ParserGetLicenseType(const ATL::CStringW& szFileName) @@ -145,12 +155,15 @@ InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, szVersion, CFE_BOLD, 0); } else + { InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC); - + } } else + { InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); - + } + InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); } @@ -185,6 +198,38 @@ } +VOID +InsertLanguageInfo_RichEdit(PAPPLICATION_INFO Info) +{ + const INT nTranslations = Info->Languages.GetSize(); + ATL::CStringW szLangInfo; + ATL::CStringW szLoadedTextAvailability; + ATL::CStringW szLoadedAInfoText; + szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); + + if(HasNativeLanguage(Info)) + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION); + } + else if (HasEnglishLanguage(Info)) + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION); + } + else + { + szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION); + } + + if (nTranslations > 1) + { + szLangInfo.Format(L" (+%d more)", nTranslations - 1); + } + + InsertRichEditText(szLoadedAInfoText, CFE_BOLD); + InsertRichEditText(szLoadedTextAvailability, NULL); + InsertRichEditText(szLangInfo, CFE_ITALIC); +} + BOOL ShowAvailableAppInfo(INT Index) { @@ -194,6 +239,7 @@ NewRichEditText(Info->szName, CFE_BOLD); InsertVersionInfo_RichEdit(Info); InsertLicenseInfo_RichEdit(Info); + InsertLanguageInfo_RichEdit(Info); InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0); InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h [iso-8859-1] Thu Jul 13 22:01:02 2017 @@ -9,14 +9,17 @@ SETTEXTEX SetText; LONG Len = GetTextLen(); - /* Insert new text */ - SetText.flags = ST_SELECTION; - SetText.codepage = 1200; + if (InsertedTextLen) + { + /* Insert new text */ + SetText.flags = ST_SELECTION; + SetText.codepage = 1200; - SendMessageW(EM_SETTEXTEX, (WPARAM) &SetText, (LPARAM) lpszText); + SendMessageW(EM_SETTEXTEX, (WPARAM) &SetText, (LPARAM) lpszText); - SetRangeFormatting(Len, Len + InsertedTextLen, - (dwEffects == CFM_LINK) ? (PathIsURLW(lpszText) ? dwEffects : 0) : dwEffects); + SetRangeFormatting(Len, Len + InsertedTextLen, + (dwEffects == CFM_LINK) ? (PathIsURLW(lpszText) ? dwEffects : 0) : dwEffects); + } } public: Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Thu Jul 13 22:01:02 2017 @@ -158,6 +158,7 @@ IDS_AINFO_URLSITE "\nHome Page: " IDS_AINFO_LICENSE "\nLicense: " IDS_AINFO_URLDOWNLOAD "\nDownload: " + IDS_AINFO_LANGUAGES "\nLanguages: " END STRINGTABLE @@ -224,3 +225,11 @@ IDS_LICENSE_FREEWARE "Freeware" IDS_LICENSE_TRIAL "Trial/Demo" END + +STRINGTABLE +BEGIN + IDS_LANGUAGE_AVAILABLE_TRANSLATION "In your language" + IDS_LANGUAGE_NO_TRANSLATION "In your language" + IDS_LANGUAGE_NOT_AVAILABLE "No translations" + IDS_LANGUAGE_ENGLISH_TRANSLATION "In English" +END Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Thu Jul 13 22:01:02 2017 @@ -26,7 +26,7 @@ MENUITEM SEPARATOR MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase\tCtrl+F5", ID_RESETDB + MENUITEM "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº &Ð¿ÑÐ¾Ð³ÑÐ°Ð¼\tCtrl+F5", ID_RESETDB END POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN @@ -56,7 +56,7 @@ MENUITEM SEPARATOR MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase\tCtrl+F5", ID_RESETDB + MENUITEM "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº &Ð¿ÑÐ¾Ð³ÑÐ°Ð¼\tCtrl+F5", ID_RESETDB END END @@ -79,7 +79,7 @@ CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "ÐÐ¸ÐºÐ»ÑÑÐµÐ½Ð½Ñ", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 @@ -125,7 +125,7 @@ IDS_TOOLTIP_MODIFY "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" IDS_TOOLTIP_SETTINGS "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" IDS_TOOLTIP_REFRESH "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸" - IDS_TOOLTIP_UPDATE_DB "Update Database" + IDS_TOOLTIP_UPDATE_DB "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿ÑÐ¾Ð³ÑÐ°Ð¼" IDS_TOOLTIP_EXIT "ÐÐ¸ÑÑÐ´" END @@ -206,14 +206,14 @@ IDS_CHOOSE_FOLDER_ERROR "ÐÐ¸ Ð²ÐºÐ°Ð·Ð°Ð»Ð¸ Ð½ÐµÑÑÐ½ÑÑÑÑ ÑÐµÐºÑ!" IDS_APP_REG_REMOVE "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ ÑÐ¾ÑÐµÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº! ÐÐ´ÑÐµÑÑ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾!" + IDS_UNABLE_TO_DOWNLOAD2 "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº! ÐÐµÑÐµÐ²ÑÑÑÐµ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ Ð¼ÐµÑÐµÐ¶Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ!" IDS_UNABLE_TO_REMOVE "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." - IDS_INTEG_CHECK_TITLE "Verifying package integrity..." - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." + IDS_CERT_DOES_NOT_MATCH "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÐµÑÐµÐ²ÑÐºÐ¸ ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÑ SSL." + IDS_INTEG_CHECK_TITLE "ÐÐµÑÐµÐ²ÑÑÐºÐ° ÑÑÐ»ÑÑÑÐ½Ð¾ÑÑÑ Ð´Ð¾Ð´Ð°ÑÐºÑ..." + IDS_INTEG_CHECK_FAIL "ÐÐ¾Ð´Ð°ÑÐ¾Ðº Ð½Ðµ Ð¿ÑÐ¾Ð¹ÑÐ¾Ð² Ð¿ÐµÑÐµÐ²ÑÑÐºÑ ÑÑÐ»ÑÑÑÐ½Ð¾ÑÑÑ, Ð¹Ð¾Ð³Ð¾ Ð¼Ð¾Ð»Ð³Ð¸ Ð¿Ð¾ÑÐºÐ¾Ð´Ð¸ÑÐ¸ ÑÐ¸ Ð·Ð°Ð¼ÑÐ½Ð¸ÑÐ¸. ÐÐ°Ð¿ÑÑÐº Ð´Ð¾Ð´Ð°ÑÐºÑ Ð½Ðµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÑÑÑÑÑ." + IDS_INTERRUPTED_DOWNLOAD "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÑÐ²Ð°Ð½Ð¾. ÐÐµÑÐµÐ²ÑÑÑÐµ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ Ð¼ÐµÑÐµÐ¶Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ." + IDS_UNABLE_TO_WRITE "ÐÐ°Ð¿Ð¸ÑÐº Ð½Ð° Ð´Ð¸ÑÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¸Ð¹. ÐÐ¾Ð¶Ð»Ð¸Ð²Ð¾, Ð½Ð° Ð´Ð¸ÑÐºÑ Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¼ÑÑÑÑÑ." END STRINGTABLE Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Thu Jul 13 22:01:02 2017 @@ -145,6 +145,7 @@ #define IDS_AINFO_LICENSE 354 #define IDS_AINFO_URLDOWNLOAD 355 #define IDS_AINFO_AVAILABLEVERSION 356 +#define IDS_AINFO_LANGUAGES 357 /* Names of categories */ @@ -177,6 +178,12 @@ #define IDS_LICENSE_FREEWARE 901 #define IDS_LICENSE_TRIAL 902 +/* Language related strings */ +#define IDS_LANGUAGE_AVAILABLE_TRANSLATION 910 +#define IDS_LANGUAGE_NO_TRANSLATION 911 +#define IDS_LANGUAGE_NOT_AVAILABLE 912 +#define IDS_LANGUAGE_ENGLISH_TRANSLATION 913 + /* Accelerators */ #define HOTKEYS 715

7 years, 5 months

[hbelusca] 75333: [CMAKE]: Correctly set valid PE image version numbers for the OS subsystem (GCC builds), and image and OS version numbers from the NT OS version ReactOS is based on.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 13 20:50:49 2017 New Revision: 75333 URL: http://svn.reactos.org/svn/reactos?rev=75333&view=rev Log: [CMAKE]: Correctly set valid PE image version numbers for the OS subsystem (GCC builds), and image and OS version numbers from the NT OS version ReactOS is based on. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake trunk/reactos/sdk/cmake/gcc.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Thu Jul 13 20:50:49 2017 @@ -581,12 +581,20 @@ set_subsystem(${MODULE} ${__subsystem}) endif() - #set unicode definitions + # Set the PE image version numbers from the NT OS version ReactOS is based on + if (MSVC) + add_target_link_flags(${MODULE} "/VERSION:5.01") + else() + add_target_link_flags(${MODULE} "-Wl,--major-image-version,5 -Wl,--minor-image-version,01") + add_target_link_flags(${MODULE} "-Wl,--major-os-version,5 -Wl,--minor-os-version,01") + endif() + + # Set unicode definitions if(__module_UNICODE) add_target_compile_definitions(${MODULE} UNICODE _UNICODE) endif() - # set entry point + # Set entry point if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0")) list(GET __module_ENTRYPOINT 0 __entrypoint) list(LENGTH __module_ENTRYPOINT __length) @@ -633,7 +641,7 @@ endif() endif() - #set base address + # Set base address if(__module_IMAGEBASE) set_image_base(${MODULE} ${__module_IMAGEBASE}) elseif(${TYPE} STREQUAL win32dll) @@ -662,7 +670,7 @@ set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") endif() - # do compiler specific stuff + # Do compiler specific stuff set_module_type_toolchain(${MODULE} ${TYPE}) endfunction() Modified: trunk/reactos/sdk/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/gcc.cmake?rev=75… ============================================================================== --- trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/gcc.cmake [iso-8859-1] Thu Jul 13 20:50:49 2017 @@ -289,7 +289,7 @@ endfunction() function(set_subsystem MODULE SUBSYSTEM) - add_target_link_flags(${MODULE} "-Wl,--subsystem,${SUBSYSTEM}") + add_target_link_flags(${MODULE} "-Wl,--subsystem,${SUBSYSTEM}:5.01") endfunction() function(set_image_base MODULE IMAGE_BASE)

7 years, 5 months

[jimtabor] 75332: [Eng] - Implement PATHOBJ_Xxx service routines, see CORE-13536.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 13 19:34:49 2017 New Revision: 75332 URL: http://svn.reactos.org/svn/reactos?rev=75332&view=rev Log: [Eng] - Implement PATHOBJ_Xxx service routines, see CORE-13536. Added: trunk/reactos/win32ss/gdi/eng/pathobj.c (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/eng/stubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Thu Jul 13 19:34:49 2017 @@ -76,6 +76,7 @@ gdi/eng/engmisc.c gdi/eng/mouse.c gdi/eng/paint.c + gdi/eng/pathobj.c gdi/eng/pdevobj.c gdi/eng/perfcnt.c gdi/eng/rlecomp.c Added: trunk/reactos/win32ss/gdi/eng/pathobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pathobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pathobj.c (added) +++ trunk/reactos/win32ss/gdi/eng/pathobj.c [iso-8859-1] Thu Jul 13 19:34:49 2017 @@ -0,0 +1,457 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS win32 subsystem + * PURPOSE: PATHOBJ service routines + * FILE: win32ss/gdi/eng/pathobj.c + * PROGRAMERS: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +/* INCLUDES *****************************************************************/ + +#include <win32k.h> +#undef XFORMOBJ + +#define NDEBUG +#include <debug.h> + +/* TYPES *********************************************************************/ + +/* extended PATHDATA */ +typedef struct _EXTPATHDATA +{ + PATHDATA pd; + struct _EXTPATHDATA *ppdNext; +} EXTPATHDATA, *PEXTPATHDATA; + +/* extended PATHOBJ */ +typedef struct _EXTPATHOBJ +{ + PATHOBJ po; + PEXTPATHDATA ppdFirst; + PEXTPATHDATA ppdLast; + PEXTPATHDATA ppdCurrent; +} EXTPATHOBJ, *PEXTPATHOBJ; + +/* FUNCTIONS *****************************************************************/ + +/* FIXME: set last error */ +/* FIXME: PATHOBJ_vEnumStartClipLines and PATHOBJ_bEnumClipLines */ + +/* + * @implemented + */ +PATHOBJ* +APIENTRY +EngCreatePath(VOID) +{ + PEXTPATHOBJ pPathObj; + const ULONG size = sizeof(EXTPATHOBJ); + + pPathObj = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pPathObj == NULL) + { + return NULL; + } + + RtlZeroMemory(pPathObj, size); + return &pPathObj->po; +} + +/* + * @implemented + */ +VOID +APIENTRY +EngDeletePath(IN PATHOBJ *ppo) +{ + PEXTPATHOBJ pPathObj; + PEXTPATHDATA ppd, ppdNext; + + pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL) + return; + + for (ppd = pPathObj->ppdFirst; ppd; ppd = ppdNext) + { + ppdNext = ppd->ppdNext; + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + } + ExFreePoolWithTag(pPathObj, GDITAG_PATHOBJ); +} + +/* + * @implemented + */ +BOOL +APIENTRY +PATHOBJ_bCloseFigure(IN PATHOBJ *ppo) +{ + PEXTPATHDATA ppd; + PEXTPATHOBJ pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL) + return FALSE; + + ppd = pPathObj->ppdLast; + if (ppd == NULL) + return FALSE; + + ppd->pd.flags |= PD_CLOSEFIGURE | PD_ENDSUBPATH; + return TRUE; +} + +/* + * @implemented + */ +VOID +APIENTRY +PATHOBJ_vEnumStart(IN PATHOBJ *ppo) +{ + PEXTPATHOBJ pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL) + return; + + pPathObj->ppdCurrent = pPathObj->ppdFirst; +} + +/* + * @implemented + */ +BOOL +APIENTRY +PATHOBJ_bEnum( + IN PATHOBJ *ppo, + OUT PATHDATA *ppd) +{ + PEXTPATHOBJ pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL || pPathObj->ppdCurrent == NULL) + return FALSE; + + *ppd = pPathObj->ppdCurrent->pd; + + pPathObj->ppdCurrent = pPathObj->ppdCurrent->ppdNext; + return (pPathObj->ppdCurrent != NULL); +} + +/* + * @implemented + */ +BOOL +APIENTRY +PATHOBJ_bMoveTo( + IN PATHOBJ *ppo, + IN POINTFIX ptfx) +{ + PEXTPATHOBJ pPathObj; + PEXTPATHDATA ppd, ppdLast; + + pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL) + return FALSE; + + /* allocate a subpath data */ + ppd = ExAllocatePoolWithTag(PagedPool, sizeof(EXTPATHDATA), GDITAG_PATHOBJ); + if (ppd == NULL) + return FALSE; + + RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); + + /* add the first point to the subpath */ + ppd->pd.flags = PD_BEGINSUBPATH; + ppd->pd.count = 1; + ppd->pd.pptfx = ExAllocatePoolWithTag(PagedPool, sizeof(POINTFIX), GDITAG_PATHOBJ); + if (ppd->pd.pptfx == NULL) + { + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + return FALSE; + } + ppd->pd.pptfx[0] = ptfx; + + ppdLast = pPathObj->ppdLast; + if (ppdLast) + { + /* end the last subpath */ + ppdLast->pd.flags |= PD_ENDSUBPATH; + + /* add the subpath to the last */ + ppdLast->ppdNext = ppd; + pPathObj->ppdLast = ppd; + } + else + { + /* add the subpath */ + pPathObj->ppdLast = pPathObj->ppdFirst = ppd; + } + + pPathObj->po.cCurves++; + + return TRUE; +} + +/* + * @implemented + */ +BOOL +APIENTRY +PATHOBJ_bPolyLineTo( + IN PATHOBJ *ppo, + IN POINTFIX *pptfx, + IN ULONG cptfx) +{ + PEXTPATHOBJ pPathObj; + PEXTPATHDATA ppd, ppdLast; + PPOINTFIX pptfxNew, pptfxOld; + ULONG size; + + pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL || pptfx == NULL || cptfx == 0) + return FALSE; + + ppdLast = pPathObj->ppdLast; + if (ppdLast == NULL) + { + /* allocate a subpath data */ + ppd = ExAllocatePoolWithTag(PagedPool, sizeof(EXTPATHDATA), GDITAG_PATHOBJ); + if (ppd == NULL) + return FALSE; + + /* store data */ + RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); + ppd->pd.flags = PD_BEGINSUBPATH; + ppd->pd.count = cptfx; + + size = cptfx * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + { + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + return FALSE; + } + RtlCopyMemory(pptfxNew, pptfx, size); + ppd->pd.pptfx = pptfxNew; + + /* set the subpath */ + pPathObj->ppdLast = pPathObj->ppdFirst = ppd; + + pPathObj->po.cCurves++; + } + else if (ppdLast->pd.flags & (PD_BEZIERS | PD_ENDSUBPATH)) + { + /* allocate a subpath data */ + ppd = ExAllocatePoolWithTag(PagedPool, sizeof(EXTPATHDATA), GDITAG_PATHOBJ); + if (ppd == NULL) + return FALSE; + + /* store data */ + RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); + ppd->pd.flags = 0; + ppd->pd.count = cptfx; + + size = cptfx * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + { + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + return FALSE; + } + RtlCopyMemory(pptfxNew, pptfx, size); + ppd->pd.pptfx = pptfxNew; + + /* add to last */ + ppdLast->ppdNext = ppd; + pPathObj->ppdLast = ppd; + + pPathObj->po.cCurves++; + } + else + { + /* concatnate ppdLast->pd.pptfx and pptfx */ + size = (ppdLast->pd.count + cptfx) * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + return FALSE; + + size = ppdLast->pd.count * sizeof(POINTFIX); + RtlCopyMemory(&pptfxNew[0], ppdLast->pd.pptfx, size); + size = cptfx * sizeof(POINTFIX); + RtlCopyMemory(&pptfxNew[ppdLast->pd.count], pptfx, size); + + pptfxOld = ppdLast->pd.pptfx; + ppd->pd.pptfx = pptfxNew; + ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +APIENTRY +PATHOBJ_bPolyBezierTo( + IN PATHOBJ *ppo, + IN POINTFIX *pptfx, + IN ULONG cptfx) +{ + PEXTPATHDATA ppd, ppdLast; + PEXTPATHOBJ pPathObj; + PPOINTFIX pptfxNew, pptfxOld; + ULONG size; + + pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL || pptfx == NULL || cptfx == 0) + return FALSE; + + ppdLast = pPathObj->ppdLast; + if (ppdLast == NULL) + { + /* allocate a subpath data */ + ppd = ExAllocatePoolWithTag(PagedPool, sizeof(EXTPATHDATA), GDITAG_PATHOBJ); + if (ppd == NULL) + return FALSE; + + /* store data */ + RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); + ppd->pd.flags = PD_BEGINSUBPATH | PD_BEZIERS; + ppd->pd.count = cptfx; + + size = cptfx * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + { + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + return FALSE; + } + RtlCopyMemory(pptfxNew, pptfx, size); + ppd->pd.pptfx = pptfxNew; + + /* set the subpath */ + pPathObj->ppdLast = pPathObj->ppdFirst = ppd; + + pPathObj->po.cCurves++; + } + else if (!(ppdLast->pd.flags & PD_BEZIERS) || (ppdLast->pd.flags & PD_ENDSUBPATH)) + { + /* allocate a subpath data */ + ppd = ExAllocatePoolWithTag(PagedPool, sizeof(EXTPATHDATA), GDITAG_PATHOBJ); + if (ppd == NULL) + return FALSE; + + /* store data */ + RtlZeroMemory(ppd, sizeof(EXTPATHDATA)); + ppd->pd.flags = PD_BEZIERS; + ppd->pd.count = cptfx; + + size = cptfx * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + { + ExFreePoolWithTag(ppd, GDITAG_PATHOBJ); + return FALSE; + } + RtlCopyMemory(pptfxNew, pptfx, size); + ppd->pd.pptfx = pptfxNew; + + /* add to last */ + ppdLast->ppdNext = ppd; + pPathObj->ppdLast = ppd; + + pPathObj->po.cCurves++; + } + else + { + /* concatnate ppdLast->pd.pptfx and pptfx */ + size = (ppdLast->pd.count + cptfx) * sizeof(POINTFIX); + pptfxNew = ExAllocatePoolWithTag(PagedPool, size, GDITAG_PATHOBJ); + if (pptfxNew == NULL) + return FALSE; + + size = ppdLast->pd.count * sizeof(POINTFIX); + RtlCopyMemory(&pptfxNew[0], ppdLast->pd.pptfx, size); + size = cptfx * sizeof(POINTFIX); + RtlCopyMemory(&pptfxNew[ppdLast->pd.count], pptfx, size); + + pptfxOld = ppdLast->pd.pptfx; + ppd->pd.pptfx = pptfxNew; + ExFreePoolWithTag(pptfxOld, GDITAG_PATHOBJ); + } + + pPathObj->po.fl |= PO_BEZIERS; + + return TRUE; +} + +VOID +APIENTRY +PATHOBJ_vEnumStartClipLines( + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN SURFOBJ *pso, + IN LINEATTRS *pla) +{ + UNIMPLEMENTED; +} + +BOOL +APIENTRY +PATHOBJ_bEnumClipLines( + IN PATHOBJ *ppo, + IN ULONG cb, + OUT CLIPLINE *pcl) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @implemented + */ +VOID +APIENTRY +PATHOBJ_vGetBounds( + IN PATHOBJ *ppo, + OUT PRECTFX prectfx) +{ + FIX xLeft, yTop, xRight, yBottom; + PEXTPATHOBJ pPathObj; + PEXTPATHDATA ppd, ppdNext; + ULONG i; + + pPathObj = (PEXTPATHOBJ)ppo; + if (pPathObj == NULL || prectfx == NULL) + return; + + yTop = xLeft = MAXLONG; + yBottom = xRight = MINLONG; + + for (ppd = pPathObj->ppdFirst; ppd; ppd = ppdNext) + { + ppdNext = ppd->ppdNext; + for (i = 0; i < ppd->pd.count; ++i) + { + PPOINTFIX pptfx = &ppd->pd.pptfx[i]; + if (pptfx->x < xLeft) + xLeft = pptfx->x; + if (pptfx->x > xRight) + xRight = pptfx->x; + if (pptfx->y < yTop) + yTop = pptfx->y; + if (pptfx->y > yBottom) + yBottom = pptfx->y; + } + } + + if (xLeft <= xRight && yTop <= yBottom) + { + prectfx->xLeft = xLeft; + prectfx->yTop = yTop; + prectfx->xRight = xRight + 1; + prectfx->yBottom = yBottom + 1; + } + else + { + RtlZeroMemory(prectfx, sizeof(*prectfx)); + } +} + +/* EOF */ Propchange: trunk/reactos/win32ss/gdi/eng/pathobj.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/win32ss/gdi/eng/pathobj.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/win32ss/gdi/eng/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stubs.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] Thu Jul 13 19:34:49 2017 @@ -72,29 +72,6 @@ /* * @unimplemented */ -PATHOBJ* -APIENTRY -EngCreatePath(VOID) -{ - // www.osr.com/ddk/graphics/gdifncs_4aav.htm - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -VOID -APIENTRY -EngDeletePath(IN PATHOBJ *ppo) -{ - // www.osr.com/ddk/graphics/gdifncs_3fl3.htm - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ BOOL APIENTRY EngEnumForms( @@ -496,103 +473,6 @@ // www.osr.com/ddk/graphics/gdifncs_8kvb.htm UNIMPLEMENTED; return 0; -} - -BOOL -APIENTRY -PATHOBJ_bCloseFigure(IN PATHOBJ *ppo) -{ - // www.osr.com/ddk/graphics/gdifncs_5mhz.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -APIENTRY -PATHOBJ_bEnum( - IN PATHOBJ *ppo, - OUT PATHDATA *ppd) -{ - // www.osr.com/ddk/graphics/gdifncs_98o7.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -APIENTRY -PATHOBJ_bEnumClipLines( - IN PATHOBJ *ppo, - IN ULONG cb, - OUT CLIPLINE *pcl) -{ - // www.osr.com/ddk/graphics/gdifncs_4147.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -APIENTRY -PATHOBJ_bMoveTo( - IN PATHOBJ *ppo, - IN POINTFIX ptfx) -{ - // www.osr.com/ddk/graphics/gdifncs_70vb.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -APIENTRY -PATHOBJ_bPolyBezierTo( - IN PATHOBJ *ppo, - IN POINTFIX *pptfx, - IN ULONG cptfx) -{ - // www.osr.com/ddk/graphics/gdifncs_2c9z.htm - UNIMPLEMENTED; - return FALSE; -} - -BOOL -APIENTRY -PATHOBJ_bPolyLineTo( - IN PATHOBJ *ppo, - IN POINTFIX *pptfx, - IN ULONG cptfx) -{ - // www.osr.com/ddk/graphics/gdifncs_0x47.htm - UNIMPLEMENTED; - return FALSE; -} - -VOID -APIENTRY -PATHOBJ_vEnumStart(IN PATHOBJ *ppo) -{ - // www.osr.com/ddk/graphics/gdifncs_74br.htm - UNIMPLEMENTED; -} - -VOID -APIENTRY -PATHOBJ_vEnumStartClipLines( - IN PATHOBJ *ppo, - IN CLIPOBJ *pco, - IN SURFOBJ *pso, - IN LINEATTRS *pla) -{ - // www.osr.com/ddk/graphics/gdifncs_5grr.htm - UNIMPLEMENTED; -} - -VOID -APIENTRY -PATHOBJ_vGetBounds( - IN PATHOBJ *ppo, - OUT PRECTFX prectfx) -{ - // www.osr.com/ddk/graphics/gdifncs_8qp3.htm - UNIMPLEMENTED; } /*

7 years, 5 months

[hbelusca] 75331: [USERINIT]: Some changes: - Split TryToStartShell() into a StartProcess() function whose aim is to just start processes, and TryToStartShell() whose aim is to start a shell (using...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 13 19:10:27 2017 New Revision: 75331 URL: http://svn.reactos.org/svn/reactos?rev=75331&view=rev Log: [USERINIT]: Some changes: - Split TryToStartShell() into a StartProcess() function whose aim is to just start processes, and TryToStartShell() whose aim is to start a shell (using the previous function) and perform extra initialization. - Modify StartInstaller() to call StartProcess() for starting the ReactOS GUI installer found on the installation media, from a path automatically expanded depending on the ambient CPU architecture. Modified: branches/setup_improvements/base/system/userinit/userinit.c Modified: branches/setup_improvements/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/… ============================================================================== --- branches/setup_improvements/base/system/userinit/userinit.c [iso-8859-1] (original) +++ branches/setup_improvements/base/system/userinit/userinit.c [iso-8859-1] Thu Jul 13 19:10:27 2017 @@ -230,14 +230,13 @@ } static BOOL -TryToStartShell( - IN LPCWSTR Shell) +StartProcess( + IN LPWSTR CommandLine) { STARTUPINFO si; PROCESS_INFORMATION pi; - WCHAR ExpandedShell[MAX_PATH]; - - TRACE("(%s)\n", debugstr_w(Shell)); + + TRACE("(%s)\n", debugstr_w(CommandLine)); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); @@ -245,10 +244,8 @@ si.wShowWindow = SW_SHOWNORMAL; ZeroMemory(&pi, sizeof(pi)); - ExpandEnvironmentStringsW(Shell, ExpandedShell, ARRAYSIZE(ExpandedShell)); - if (!CreateProcessW(NULL, - ExpandedShell, + CommandLine, NULL, NULL, FALSE, @@ -258,14 +255,30 @@ &si, &pi)) { - WARN("CreateProcess() failed with error %lu\n", GetLastError()); + WARN("CreateProcessW() failed with error %lu\n", GetLastError()); return FALSE; } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return TRUE; +} + +static BOOL +TryToStartShell( + IN LPCWSTR Shell) +{ + WCHAR ExpandedShell[MAX_PATH]; + + TRACE("(%s)\n", debugstr_w(Shell)); + + ExpandEnvironmentStringsW(Shell, ExpandedShell, ARRAYSIZE(ExpandedShell)); + + if (!StartProcess(ExpandedShell)) + return FALSE; StartAutoApplications(CSIDL_STARTUP); StartAutoApplications(CSIDL_COMMON_STARTUP); - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); return TRUE; } @@ -552,22 +565,101 @@ static BOOL StartInstaller(VOID) { - WCHAR Shell[MAX_PATH]; + SYSTEM_INFO SystemInfo; + PWSTR ptr; + WCHAR Installer[MAX_PATH]; WCHAR szMsg[RC_STRING_MAX_SIZE]; - if (GetWindowsDirectoryW(Shell, ARRAYSIZE(Shell) - 12)) - wcscat(Shell, L"\\reactos.exe"); + /* + * First, check whether we can start the installer from either the current + * ReactOS installation directory, or from our current directory. + */ + *Installer = UNICODE_NULL; + /* Alternatively one can use SharedUserData->NtSystemRoot */ + if (GetSystemWindowsDirectoryW(Installer, ARRAYSIZE(Installer) - 12)) + wcscat(Installer, L"\\"); + wcscat(Installer, L"reactos.exe"); + + if (StartProcess(Installer)) + return TRUE; + + ERR("Failed to start the installer: '%s', trying alternative.\n", debugstr_w(Installer)); + + /* + * We failed. Try using the default drive, under the directory whose + * name corresponds to the currently-runnning CPU architecture. + */ + GetSystemInfo(&SystemInfo); + + *Installer = UNICODE_NULL; + /* Alternatively one can use SharedUserData->NtSystemRoot */ + GetSystemWindowsDirectoryW(Installer, ARRAYSIZE(Installer) - 12); + ptr = wcschr(Installer, L'\\'); + if (ptr) + *++ptr = UNICODE_NULL; else - wcscpy(Shell, L"reactos.exe"); - - if (!TryToStartShell(Shell)) - { - WARN("Failed to start the installer: %s\n", debugstr_w(Shell)); - LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg)); - MessageBoxW(NULL, szMsg, NULL, MB_OK); - return FALSE; - } - return TRUE; + *Installer = UNICODE_NULL; + + /* Append the corresponding CPU architecture */ + switch (SystemInfo.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + wcscat(Installer, L"I386"); + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + wcscat(Installer, L"MIPS"); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + wcscat(Installer, L"ALPHA"); + break; + + case PROCESSOR_ARCHITECTURE_PPC: + wcscat(Installer, L"PPC"); + break; + + case PROCESSOR_ARCHITECTURE_SHX: + wcscat(Installer, L"SHX"); + break; + + case PROCESSOR_ARCHITECTURE_ARM: + wcscat(Installer, L"ARM"); + break; + + case PROCESSOR_ARCHITECTURE_IA64: + wcscat(Installer, L"IA64"); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + wcscat(Installer, L"ALPHA64"); + break; + +#if 0 // .NET CPU-independent code + case PROCESSOR_ARCHITECTURE_MSIL: + wcscat(Installer, L"MSIL"); + break; +#endif + + case PROCESSOR_ARCHITECTURE_AMD64: + wcscat(Installer, L"AMD64"); + break; + + case PROCESSOR_ARCHITECTURE_UNKNOWN: + default: + break; + } + + wcscat(Installer, L"\\reactos.exe"); + + if (StartProcess(Installer)) + return TRUE; + + /* We failed. Display an error message and quit. */ + ERR("Failed to start the installer: '%s'.\n", debugstr_w(Installer)); + LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg)); + MessageBoxW(NULL, szMsg, NULL, MB_OK); + return FALSE; } /* Used to get the shutdown privilege */

7 years, 5 months

[hbelusca] 75330: [WELCOME (autorun)]: Automatically expands the path to the ReactOS installer executable found on the installation media, depending on the ambient CPU architecture.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 13 18:41:32 2017 New Revision: 75330 URL: http://svn.reactos.org/svn/reactos?rev=75330&view=rev Log: [WELCOME (autorun)]: Automatically expands the path to the ReactOS installer executable found on the installation media, depending on the ambient CPU architecture. Modified: branches/setup_improvements/base/setup/welcome/welcome.c Modified: branches/setup_improvements/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/w… ============================================================================== --- branches/setup_improvements/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/welcome/welcome.c [iso-8859-1] Thu Jul 13 18:41:32 2017 @@ -210,6 +210,87 @@ } } +/* + * Expands the path for the ReactOS Installer "reactos.exe". + * See also base/system/userinit/userinit.c!StartInstaller() + */ +VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) +{ + SYSTEM_INFO SystemInfo; + PTSTR ptr; + +#if 0 + if (_tcsicmp(lpInstallerPath, TEXT("reactos.exe")) != 0) + return; +#endif + + /* + * Using the default drive, under the directory whose name + * corresponds to the currently-runnning CPU architecture. + */ + GetSystemInfo(&SystemInfo); + + *lpInstallerPath = UNICODE_NULL; + GetModuleFileName(NULL, lpInstallerPath, PathSize); + ptr = _tcschr(lpInstallerPath, _T('\\')); + if (ptr) + *++ptr = UNICODE_NULL; + else + *lpInstallerPath = UNICODE_NULL; + + /* Append the corresponding CPU architecture */ + switch (SystemInfo.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + StringCchCat(lpInstallerPath, PathSize, TEXT("I386")); + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + StringCchCat(lpInstallerPath, PathSize, TEXT("MIPS")); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + StringCchCat(lpInstallerPath, PathSize, TEXT("ALPHA")); + break; + + case PROCESSOR_ARCHITECTURE_PPC: + StringCchCat(lpInstallerPath, PathSize, TEXT("PPC")); + break; + + case PROCESSOR_ARCHITECTURE_SHX: + StringCchCat(lpInstallerPath, PathSize, TEXT("SHX")); + break; + + case PROCESSOR_ARCHITECTURE_ARM: + StringCchCat(lpInstallerPath, PathSize, TEXT("ARM")); + break; + + case PROCESSOR_ARCHITECTURE_IA64: + StringCchCat(lpInstallerPath, PathSize, TEXT("IA64")); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + StringCchCat(lpInstallerPath, PathSize, TEXT("ALPHA64")); + break; + +#if 0 // .NET CPU-independent code + case PROCESSOR_ARCHITECTURE_MSIL: + StringCchCat(lpInstallerPath, PathSize, TEXT("MSIL")); + break; +#endif + + case PROCESSOR_ARCHITECTURE_AMD64: + StringCchCat(lpInstallerPath, PathSize, TEXT("AMD64")); + break; + + case PROCESSOR_ARCHITECTURE_UNKNOWN: + default: + break; + } + + StringCchCat(lpInstallerPath, PathSize, TEXT("\\reactos.exe")); +} + VOID InitializeTopicList(VOID) { dwNumberTopics = 0; @@ -275,6 +356,10 @@ { pTopic->bIsCommand = TRUE; StringCchCopy(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand), szCommand); + + /* Check for special applications: ReactOS Installer */ + if (_tcsicmp(pTopic->szCommand, TEXT("reactos.exe")) == 0) + ExpandInstallerPath(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand)); } else {

7 years, 5 months

[jimtabor] 75329: [NtGDI] - Update path structure for future use.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 13 17:30:15 2017 New Revision: 75329 URL: http://svn.reactos.org/svn/reactos?rev=75329&view=rev Log: [NtGDI] - Update path structure for future use. Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Thu Jul 13 17:30:15 2017 @@ -20,15 +20,27 @@ PATH_Closed } GdiPathState; +// Path type flags +#define PATHTYPE_KEEPME 1 +#define PATHTYPE_STACK 2 + typedef struct _PATH { BASEOBJECT BaseObject; - + //PVOID ppachain; RECTFX rcfxBoundBox; POINTFX ptfxSubPathStart; + FLONG flType; + //PEXTPATHDATA ppdFirst; + //PEXTPATHDATA ppdLast; + FLONG flags; // PATHDATA flags. + //PEXTPATHDATA ppdCurrent; + // PATHOBJ; + FLONG fl; // Saved flags. + ULONG cCurves; // Saved number of lines and Bezier. - // Things to convert from: - DWORD state; + // Wine/ReactOS Things to convert from: + FLONG state; POINT *pPoints; BYTE *pFlags; int numEntriesUsed; @@ -39,8 +51,9 @@ typedef struct _EPATHOBJ { - PATHOBJ po; - PPATH pPath; + PATHOBJ po; + PPATH pPath; + CLIPOBJ *pco; } EPATHOBJ, *PEPATHOBJ; #define PATH_AllocPath() ((PPATH) GDIOBJ_AllocObj(GDIObjType_PATH_TYPE))

7 years, 5 months

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Thu Jul 13 15:29:53 2017 New Revision: 75328 URL: http://svn.reactos.org/svn/reactos?rev=75328&view=rev Log: [RAPPS] Language loading - RAPPS now can load language list from a file where locale identifiers are separated by '|' `Language=0C09|0813|0422 \\English|Dutch|Ukrainian` The only limitation is that the parameter is only 260 chars. So there arises another goal - multiline parameters - This list is stored in `CSimpleArray<CStringW>` as strings Maybe it would be wiser to store them as INT array. - Some refactoring Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Jul 13 15:29:53 2017 @@ -12,7 +12,8 @@ ATL::CAtlList<PAPPLICATION_INFO> InfoList; -inline void InsertTextAfterLoaded_RichEdit(UINT uStringID, const ATL::CStringW& szText, DWORD StringFlags, DWORD TextFlags) +inline VOID +InsertTextAfterLoaded_RichEdit(UINT uStringID, const ATL::CStringW& szText, DWORD StringFlags, DWORD TextFlags) { ATL::CStringW szLoadedText; if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID)) @@ -22,7 +23,8 @@ } } -inline void InsertLoadedTextNewl_RichEdit(UINT uStringID, DWORD StringFlags) +inline VOID +InsertLoadedTextNewl_RichEdit(UINT uStringID, DWORD StringFlags) { ATL::CStringW szLoadedText; if (szLoadedText.LoadStringW(hInst, uStringID)) @@ -33,7 +35,8 @@ } } -inline BOOL GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString, const ATL::CStringW& cFileName) +inline BOOL +GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString, const ATL::CStringW& cFileName) { if (!ParserGetString(lpKeyName, cFileName, ReturnedString)) { @@ -42,10 +45,11 @@ } return TRUE; } + //Check both registry keys in 64bit system //TODO: check system type beforehand to avoid double checks? - -inline BOOL GetInstalledVersionEx(PAPPLICATION_INFO Info, ATL::CStringW* szVersion, REGSAM key) +inline BOOL +GetInstalledVersionEx(PAPPLICATION_INFO Info, ATL::CStringW* szVersion, REGSAM key) { return (!Info->szRegName.IsEmpty() && (GetInstalledVersion_WowUser(szVersion, Info->szRegName, TRUE, key) @@ -55,34 +59,80 @@ || GetInstalledVersion_WowUser(szVersion, Info->szName, FALSE, key))); } -inline BOOL GetInstalledVersion(PAPPLICATION_INFO Info, ATL::CStringW* szVersion) +inline BOOL +GetInstalledVersion(PAPPLICATION_INFO Info, ATL::CStringW* szVersion) { return GetInstalledVersionEx(Info, szVersion, KEY_WOW64_32KEY) || GetInstalledVersionEx(Info, szVersion, KEY_WOW64_64KEY); } -inline BOOL IsAppInstalled(PAPPLICATION_INFO Info) +inline BOOL +IsAppInstalled(PAPPLICATION_INFO Info) { return GetInstalledVersion(Info, NULL); } +ATL::CSimpleArray<ATL::CStringW> +ParserGetAppLanguages(const ATL::CStringW& szFileName) +{ + const WCHAR cDelimiter = L'|'; + ATL::CStringW szBuffer; + + if (!ParserGetString(L"Languages", szFileName, szBuffer)) + return CSimpleArray<ATL::CStringW>(); + + ATL::CStringW szLocale; + ATL::CSimpleArray<ATL::CStringW> arrLocalesResult; + for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) + { + if (szBuffer[i] != cDelimiter) + { + szLocale += szBuffer[i]; + } else { + arrLocalesResult.Add(szLocale); + szLocale.Empty(); + } + } + // For the text after delimiter + if (!szLocale.IsEmpty()) + { + arrLocalesResult.Add(szLocale); + } + return arrLocalesResult; +} + +BOOL +HasNativeLanguage(PAPPLICATION_INFO Info) +{ + if (!Info) + { + return FALSE; + } + //TODO: make the actual check + return TRUE; +} + +LICENSE_TYPE +ParserGetLicenseType(const ATL::CStringW& szFileName) +{ + INT IntBuffer = ParserGetInt(L"LicenseType", szFileName); + if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) + { + return LICENSE_TYPE::None; + } + return (LICENSE_TYPE) IntBuffer; +} LIST_ENTRY CachedEntriesHead = {&CachedEntriesHead, &CachedEntriesHead}; PLIST_ENTRY pCachedEntry = &CachedEntriesHead; -BOOL -ShowAvailableAppInfo(INT Index) -{ - PAPPLICATION_INFO Info = (PAPPLICATION_INFO) ListViewGetlParam(Index); +VOID +InsertVersionInfo_RichEdit(PAPPLICATION_INFO Info) +{ ATL::CStringW szVersion; - ATL::CStringW szLicense; BOOL bIsInstalled = IsAppInstalled(Info), bHasVersion = GetInstalledVersion(Info, &szVersion); - if (!Info) return FALSE; - - NewRichEditText(Info->szName, CFE_BOLD); - //installed status if (bIsInstalled) { if (bHasVersion) @@ -102,7 +152,12 @@ InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC); InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0); - //license +} + +VOID +InsertLicenseInfo_RichEdit(PAPPLICATION_INFO Info) +{ + ATL::CStringW szLicense; switch (Info->LicenseType) { case LICENSE_TYPE::OpenSource: @@ -127,6 +182,18 @@ szLicense.Format(L"(%ls)", Info->szLicense); InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0); } + +} + +BOOL +ShowAvailableAppInfo(INT Index) +{ + PAPPLICATION_INFO Info = (PAPPLICATION_INFO) ListViewGetlParam(Index); + if (!Info) return FALSE; + + NewRichEditText(Info->szName, CFE_BOLD); + InsertVersionInfo_RichEdit(Info); + InsertLicenseInfo_RichEdit(Info); InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0); InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK); @@ -273,11 +340,8 @@ break; Info->Category = ParserGetInt(L"Category", FindFileData.cFileName); - INT IntBuffer = ParserGetInt(L"LicenseType", FindFileData.cFileName); - if (IntBuffer < LICENSE_TYPE::Max) - { - Info->LicenseType = (LICENSE_TYPE) IntBuffer; - } + Info->LicenseType = ParserGetLicenseType(FindFileData.cFileName); + Info->Languages = ParserGetAppLanguages(FindFileData.cFileName); /* copy the cache-related fields for the next time */ Info->cFileName = FindFileData.cFileName; @@ -329,6 +393,7 @@ { PAPPLICATION_INFO Info; POSITION InfoListPosition = InfoList.GetHeadPosition(); + /* loop and deallocate all the cached app infos in the list */ while (InfoListPosition) { Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Thu Jul 13 15:29:53 2017 @@ -26,6 +26,7 @@ #include <strsafe.h> #include <ndk/rtlfuncs.h> #include <atlcoll.h> +#include <atlsimpcoll.h> #include <atlstr.h> #include <rappsmsg.h> @@ -100,7 +101,7 @@ ATL::CStringW szUrlSite; ATL::CStringW szUrlDownload; ATL::CStringW szCDPath; - ATL::CStringW szLanguages; + ATL::CSimpleArray<ATL::CStringW> Languages; /* caching mechanism related entries */ ATL::CStringW cFileName;

7 years, 5 months

[rgampa] 75327: [USBXHCI] - type cast issues solved for runtimebas and doorbellbase - controller check function written to test teh event ring and command ring functionality. - Finally inetrrupt is...

by rgampa＠svn.reactos.org

Author: rgampa Date: Thu Jul 13 06:53:28 2017 New Revision: 75327 URL: http://svn.reactos.org/svn/reactos?rev=75327&view=rev Log: [USBXHCI] - type cast issues solved for runtimebas and doorbellbase - controller check function written to test teh event ring and command ring functionality. - Finally inetrrupt is being generated upon connecting a pen drive. Interrupt service function is being called CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] Thu Jul 13 06:53:28 2017 @@ -1,5 +1,5 @@ /* XHCI hardware registers */ - +// base io addr register offsets #define XHCI_HCSP1 1 #define XHCI_HCSP2 2 #define XHCI_HCSP3 3 @@ -7,7 +7,7 @@ #define XHCI_DBOFF 5 #define XHCI_RTSOFF 6 #define XHCI_HCCP2 7 - +// operational register offsets #define XHCI_USBCMD 0 #define XHCI_USBSTS 1 #define XHCI_DNCTRL 5 @@ -15,16 +15,24 @@ #define XHCI_DCBAAP 12 #define XHCI_CONFIG 14 #define XHCI_PORTSC 100 - -#define XHCI_IMAN 0 -#define XHCI_IMOD 1 -#define XHCI_ERSTSZ 2 -#define XHCI_ERSTBA 4 -#define XHCI_ERSTDP 6 - - - -typedef union _XHCI_HC_STRUCTURAL_PARAMS_1 { +// runtime register offsets +#define XHCI_IMAN 8 +#define XHCI_IMOD 9 +#define XHCI_ERSTSZ 10 +#define XHCI_ERSTBA 12 +#define XHCI_ERSTDP 14 + + +typedef volatile union _XHCI_CAPLENGHT_INTERFACE_VERSION { + struct { + ULONG CapabilityRegistersLength : 8; + ULONG Rsvd : 8; + ULONG HostControllerInterfaceVersion : 16; + }; + ULONG AsULONG; +} XHCI_CAPLENGHT_INTERFACE_VERSION; + +typedef volatile union _XHCI_HC_STRUCTURAL_PARAMS_1 { struct { ULONG NumberOfDeviceSlots : 8; // MAXSLOTS ULONG NumberOfInterrupters : 11; // MAXINTRS @@ -34,7 +42,7 @@ ULONG AsULONG; } XHCI_HC_STRUCTURAL_PARAMS_1; -typedef union _XHCI_HC_STRUCTURAL_PARAMS_2 { +typedef volatile union _XHCI_HC_STRUCTURAL_PARAMS_2 { struct { ULONG Ist : 4; // Isochronous Scheduling Treshold ULONG ERSTMax : 4; //Even ring segment table max @@ -46,7 +54,7 @@ ULONG AsULONG; } XHCI_HC_STRUCTURAL_PARAMS_2; -typedef union _XHCI_HC_STRUCTURAL_PARAMS_3 { +typedef volatile union _XHCI_HC_STRUCTURAL_PARAMS_3 { struct { ULONG U1DeviceExitLatecy : 8; ULONG Rsvd : 8; @@ -55,7 +63,7 @@ ULONG AsULONG; } XHCI_HC_STRUCTURAL_PARAMS_3; -typedef union _XHCI_HC_CAPABILITY_PARAMS_1 { // need to comment full forms, pg 291 in xHCI documentation +typedef volatile union _XHCI_HC_CAPABILITY_PARAMS_1 { // need to comment full forms, pg 291 in xHCI documentation struct { ULONG AC64 : 1; ULONG BNC : 1; @@ -75,7 +83,7 @@ ULONG AsULONG; } XHCI_HC_CAPABILITY_PARAMS_1; -typedef union _XHCI_DOORBELL_OFFSET { +typedef volatile union _XHCI_DOORBELL_OFFSET { struct { ULONG Rsvd : 2; ULONG DBArrayOffset : 30; @@ -83,7 +91,7 @@ ULONG AsULONG; } XHCI_DOORBELL_OFFSET; -typedef union _XHCI_RT_REGISTER_SPACE_OFFSET { //RUNTIME REGISTER SPACE OFFSET +typedef volatile union _XHCI_RT_REGISTER_SPACE_OFFSET { //RUNTIME REGISTER SPACE OFFSET struct { ULONG Rsvd : 5; ULONG RTSOffset : 27; @@ -91,7 +99,7 @@ ULONG AsULONG; } XHCI_RT_REGISTER_SPACE_OFFSET; -typedef union _XHCI_HC_CAPABILITY_PARAMS_2 { +typedef volatile union _XHCI_HC_CAPABILITY_PARAMS_2 { struct { ULONG U3C : 1; ULONG CMC : 1; @@ -104,7 +112,7 @@ ULONG AsULONG; } XHCI_HC_CAPABILITY_PARAMS_2; -typedef union _XHCI_USB_COMMAND { +typedef volatile union _XHCI_USB_COMMAND { struct { ULONG RunStop : 1; ULONG HCReset : 1; @@ -123,7 +131,7 @@ ULONG AsULONG; } XHCI_USB_COMMAND; -typedef union _XHCI_USB_STATUS { +typedef volatile union _XHCI_USB_STATUS { struct { ULONG HCHalted : 1; ULONG RsvdZ1 : 1; @@ -141,7 +149,7 @@ ULONG AsULONG; } XHCI_USB_STATUS; -typedef union _XHCI_PAGE_SIZE { +typedef volatile union _XHCI_PAGE_SIZE { struct { ULONG PageSize : 16; ULONG Rsvd : 16; @@ -149,7 +157,7 @@ ULONG AsULONG; } XHCI_PAGE_SIZE; -typedef union _XHCI_DEVICE_NOTIFICATION_CONTROL { +typedef volatile union _XHCI_DEVICE_NOTIFICATION_CONTROL { struct { ULONG NotificationEnable : 16; ULONG Rsvd : 16; @@ -157,7 +165,7 @@ ULONG AsULONG; } XHCI_DEVICE_NOTIFICATION_CONTROL; -typedef union _XHCI_COMMAND_RING_CONTROL { +typedef volatile union _XHCI_COMMAND_RING_CONTROL { struct { ULONGLONG RingCycleState : 1; ULONGLONG CommandStop : 1; @@ -170,7 +178,7 @@ ULONGLONG AsULONGLONG; } XHCI_COMMAND_RING_CONTROL; -typedef union _XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY_POINTER { +typedef volatile union _XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY_POINTER { struct { ULONGLONG RsvdZ : 6; ULONGLONG DCBAAPointerLo : 26; @@ -179,7 +187,7 @@ ULONGLONG AsULONGLONG; } XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY_POINTER; -typedef union _XHCI_CONFIGURE { +typedef volatile union _XHCI_CONFIGURE { struct { ULONG MaxDeviceSlotsEnabled : 8; ULONG U3EntryEnable : 1; @@ -189,7 +197,7 @@ ULONG AsULONG; } XHCI_CONFIGURE; -typedef union _XHCI_PORT_STATUS_CONTROL { +typedef volatile union _XHCI_PORT_STATUS_CONTROL { struct { ULONG CCS : 1; ULONG PED : 1; @@ -220,7 +228,7 @@ } XHCI_PORT_STATUS_CONTROL; // Interrupt Register Set -typedef union _XHCI_INTERRUPTER_MANAGEMENT { +typedef volatile union _XHCI_INTERRUPTER_MANAGEMENT { struct { ULONG InterruptPending : 1; ULONG InterruptEnable : 1; @@ -229,7 +237,7 @@ ULONG AsULONG; } XHCI_INTERRUPTER_MANAGEMENT; -typedef union _XHCI_INTERRUPTER_MODERATION { +typedef volatile union _XHCI_INTERRUPTER_MODERATION { struct { ULONG InterruptModIterval : 16; ULONG InterruptModCounter : 16; @@ -237,7 +245,7 @@ ULONG AsULONG; } XHCI_INTERRUPTER_MODERATION; -typedef union _XHCI_EVENT_RING_TABLE_SIZE { +typedef volatile union _XHCI_EVENT_RING_TABLE_SIZE { struct { ULONG EventRingSegTableSize : 16; ULONG RsvdP : 16; @@ -245,7 +253,7 @@ ULONG AsULONG; } XHCI_EVENT_RING_TABLE_SIZE; -typedef union _XHCI_EVENT_RING_TABLE_BASE_ADDR { +typedef volatile union _XHCI_EVENT_RING_TABLE_BASE_ADDR { struct { ULONGLONG RsvdP : 6; ULONGLONG EventRingSegTableBaseAddr : 58; @@ -253,7 +261,7 @@ ULONGLONG AsULONGLONG; } XHCI_EVENT_RING_TABLE_BASE_ADDR; -typedef union _XHCI_EVENT_RING_DEQUEUE_POINTER { +typedef volatile union _XHCI_EVENT_RING_DEQUEUE_POINTER { struct { ULONGLONG DequeueERSTIndex : 3; ULONGLONG EventHandlerBusy : 1; @@ -261,3 +269,13 @@ }; ULONGLONG AsULONGLONG; } XHCI_EVENT_RING_DEQUEUE_POINTER; + +// Doorbell register +typedef volatile union _XHCI_DOORBELL { + struct { + ULONG DoorBellTarget : 8; + ULONG RsvdZ : 8; + ULONG DoorbellStreamID : 16; + }; + ULONG AsULONG; +} XHCI_DOORBELL; Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Thu Jul 13 06:53:28 2017 @@ -45,7 +45,103 @@ { DPRINT1("XHCI_CloseEndpoint: UNIMPLEMENTED. FIXME\n"); } - +MPSTATUS +NTAPI +XHCI_ControllerWorkTest(IN PXHCI_EXTENSION XhciExtension, + IN PXHCI_HC_RESOURCES HcResourcesVA, + IN PVOID resourcesStartPA) +{ + DPRINT1("XHCI_ControllerWorkTest: Initiated.\n"); + PULONG DoorBellRegisterBase; + XHCI_DOORBELL Doorbell_0; + LARGE_INTEGER CurrentTime = {{0, 0}}; + LARGE_INTEGER LastTime = {{0, 0}}; + XHCI_USB_STATUS Status; + PHYSICAL_ADDRESS HcResourcesPA; + //PULONG erstba,erstdp; + //XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; + + XHCI_COMMAND_RING_CONTROL CommandRingControlRegister; + ULONGLONG CommandRingAddr; + ULONGLONG EventRingAddr; + XHCI_EVENT_RING_TABLE_SIZE erstz; + XHCI_EVENT_RING_TABLE_BASE_ADDR erstba; + XHCI_EVENT_RING_DEQUEUE_POINTER erstdp; + XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; + // place a no op command trb on the command ring + XHCI_TRB trb; + XHCI_TRB eventtrb; + trb.CommandTRB.NoOperation.RsvdZ1 = 0; + trb.CommandTRB.NoOperation.RsvdZ2 = 0; + trb.CommandTRB.NoOperation.RsvdZ3 = 0; + trb.CommandTRB.NoOperation.CycleBit = 0; + trb.CommandTRB.NoOperation.RsvdZ4 = 0; + trb.CommandTRB.NoOperation.TRBType = 8; + trb.CommandTRB.NoOperation.RsvdZ5 = 0; + + HcResourcesVA -> CommandRing.XhciTrb[0] = trb; + // ring the commmand ring door bell register + DoorBellRegisterBase = XhciExtension->DoorBellRegisterBase; + Doorbell_0.DoorBellTarget = 0; + Doorbell_0.RsvdZ = 0; + Doorbell_0.AsULONG = 0; + WRITE_REGISTER_ULONG(DoorBellRegisterBase, Doorbell_0.AsULONG); + // wait for some time. + KeQuerySystemTime(&CurrentTime); + CurrentTime.QuadPart += 100 * 100; // 100 msec + while(TRUE) + { + KeQuerySystemTime(&LastTime); + if (LastTime.QuadPart >= CurrentTime.QuadPart) + { + break; + } + } + // check for event completion trb + eventtrb = HcResourcesVA -> EventRing.XhciTrb[0]; + DPRINT("XHCI_ControllerWorkTest: eventtrb word0 - %p\n", eventtrb.EventTRB.Word0); + DPRINT("XHCI_ControllerWorkTest: eventtrb word1 - %p\n", eventtrb.EventTRB.Word1); + DPRINT("XHCI_ControllerWorkTest: eventtrb word2 - %p\n", eventtrb.EventTRB.Word2); + DPRINT("XHCI_ControllerWorkTest: eventtrb word3 - %p\n", eventtrb.EventTRB.Word3); + // status check code + Status.AsULONG = READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_USBSTS); + DPRINT("XHCI_ControllerWorkTest: Status HCHalted - %p\n", Status.HCHalted); + DPRINT("XHCI_ControllerWorkTest: Status HostSystemError - %p\n", Status.HostSystemError); + DPRINT("XHCI_ControllerWorkTest: Status EventInterrupt - %p\n", Status.EventInterrupt); + DPRINT("XHCI_ControllerWorkTest: Status PortChangeDetect - %p\n", Status.PortChangeDetect); + DPRINT("XHCI_ControllerWorkTest: Status ControllerNotReady - %p\n", Status.ControllerNotReady); + DPRINT("XHCI_ControllerWorkTest: Status HCError - %p\n", Status.HCError); + DPRINT("XHCI_ControllerWorkTest: Status - %p\n", Status.AsULONG); + // command ring check + HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; + CommandRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.XhciTrb[0]); + DPRINT("XHCI_ControllerWorkTest: CommandRingAddr - %x\n", CommandRingAddr); + CommandRingControlRegister.AsULONGLONG = READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR+1) | READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR ); + DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister - %x\n", CommandRingControlRegister.AsULONGLONG); + DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister1 - %p\n", READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR )); + DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister2 - %p\n", READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR + 1 )); + // event ring dprints + EventRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.XhciTrb[0]); + DPRINT("XHCI_ControllerWorkTest: EventRingSegTable.RingSegmentBaseAddr - %x\n", HcResourcesVA -> EventRingSegTable.RingSegmentBaseAddr); + DPRINT("XHCI_ControllerWorkTest: EventRingSegTable.RingSegmentSize - %i\n", HcResourcesVA -> EventRingSegTable.RingSegmentSize); + DPRINT("XHCI_ControllerWorkTest: event ring addr - %x\n", EventRingAddr); + //RunTimeRegisterBase + XHCI_ERSTSZ + erstz.AsULONG = READ_REGISTER_ULONG(XhciExtension->RunTimeRegisterBase + XHCI_ERSTSZ) ; + DPRINT("XHCI_ControllerWorkTest: erstz - %p\n", erstz.AsULONG); + + erstba.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRingSegTable); + DPRINT("XHCI_ControllerWorkTest: erstba addr - %x\n", erstba.AsULONGLONG); + erstba.AsULONGLONG = READ_REGISTER_ULONG(XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA+1) | READ_REGISTER_ULONG(XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA ); + DPRINT("XHCI_ControllerWorkTest: erstba reg read - %x\n", erstba.AsULONGLONG); + + DPRINT("XHCI_ControllerWorkTest: pointer crcr - %p %p\n", XhciExtension->OperationalRegs + XHCI_CRCR+1 , XhciExtension->OperationalRegs + XHCI_CRCR); + DPRINT("XHCI_ControllerWorkTest: pointer erstz - %p\n", XhciExtension->RunTimeRegisterBase + XHCI_ERSTSZ); + DPRINT("XHCI_ControllerWorkTest: pointer erstba - %p %p\n", XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA+1 , XhciExtension->RunTimeRegisterBase + XHCI_ERSTBA); + + + DbgBreakPoint(); + return MP_STATUS_SUCCESS; +} MPSTATUS NTAPI XHCI_InitializeResources(IN PXHCI_EXTENSION XhciExtension, @@ -53,6 +149,7 @@ IN PVOID resourcesStartPA) { DPRINT1("XHCI_InitializeResources: function initiated\n"); + PXHCI_HC_RESOURCES HcResourcesVA; PHYSICAL_ADDRESS HcResourcesPA; PULONG BaseIoAdress; @@ -67,7 +164,7 @@ XHCI_EVENT_RING_DEQUEUE_POINTER erstdp; XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; - XHCI_COMMAND_RING_CONTROL CommandRingControlRegister; + XHCI_COMMAND_RING_CONTROL CommandRingControlRegister, CommandRingControlRegister_temp; XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY_POINTER DCBAAPointer; unsigned long X, Y; @@ -78,12 +175,12 @@ HcResourcesVA = (PXHCI_HC_RESOURCES)resourcesStartVA; HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; - + BaseIoAdress = XhciExtension->BaseIoAdress; + OperationalRegs = XhciExtension->OperationalRegs; //DCBAA init DCBAAPointer.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, DCBAA); - BaseIoAdress = XhciExtension->BaseIoAdress; - OperationalRegs = XhciExtension->OperationalRegs; + WRITE_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP, DCBAAPointer.DCBAAPointerLo | DCBAAPointer.RsvdZ ); WRITE_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP + 1, DCBAAPointer.DCBAAPointerHi); @@ -94,7 +191,7 @@ ASSERT(DCBAAPointer.RsvdZ == 0); // command ring intialisation. - + /* HcResourcesVA->CommandRing.Segment[0].Link[0].AsULONG = 0; HcResourcesVA->CommandRing.Segment[0].Link[1].AsULONG = 0; HcResourcesVA->CommandRing.Segment[0].Link[2].AsULONG = 0; @@ -112,31 +209,62 @@ WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR, CommandRingControlRegister.AsULONGLONG); WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1, CommandRingControlRegister.CommandRingPointerHi); + */ // end of command ring init - + // command ring intialisation. + for(int i=0; i<16; i++){ + HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word0=0; + HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word1=0; + HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word2=0; + HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word3=0; + } + CommandRingControlRegister.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.XhciTrb[0]); + ASSERT(CommandRingControlRegister.RingCycleState == 0); + ASSERT(CommandRingControlRegister.CommandStop == 0); + ASSERT(CommandRingControlRegister.CommandAbort == 0); + ASSERT(CommandRingControlRegister.CommandRingRunning == 0); + //ASSERT(CommandRingControlRegister.RsvdP == 0); + CommandRingControlRegister_temp.AsULONGLONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1) | READ_REGISTER_ULONG(OperationalRegs + XHCI_CRCR); + + CommandRingControlRegister.RsvdP = CommandRingControlRegister_temp.RsvdP; + DPRINT1("XHCI_InitializeResources : CommandRingControlRegister %p\n",CommandRingControlRegister.AsULONGLONG ); + WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR, CommandRingControlRegister.AsULONGLONG); + WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1, CommandRingControlRegister.AsULONGLONG >> 32); + // end of command ring init //Primary Interrupter init RunTimeRegisterBase = XhciExtension -> RunTimeRegisterBase; - Iman.InterruptEnable = 1; - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_IMAN , Iman.AsULONG); - // dont change imod now + erstz.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTSZ) ; erstz.EventRingSegTableSize = 1; + DPRINT1("XHCI_InitializeResources : erstz.AsULONG %p\n",erstz.AsULONG ); WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTSZ , erstz.AsULONG); + // event ring dequeue pointer. + erstdp.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing); + erstdp.DequeueERSTIndex =0; + DPRINT1("XHCI_InitializeResources : erstdp.AsULONGLONG %p\n",erstdp.AsULONGLONG ); + WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); + WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP + 1, erstdp.AsULONGLONG >> 32); + // event ring segment table base address array erstba.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRingSegTable); - - EventRingSegTable.RingSegmentBaseAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing); + EventRingSegTable.RingSegmentBaseAddr = (ULONGLONG)HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.XhciTrb[0]); + //EventRingSegTable.RingSegmentBaseAddr = &(HcResourcesVA -> EventRing.XhciTrb[0]); EventRingSegTable.RingSegmentSize = 16; + EventRingSegTable.RsvdZ = 0; HcResourcesVA->EventRingSegTable = EventRingSegTable; - + DPRINT1("XHCI_InitializeResources : erstba.AsULONGLONG %p\n",erstba.AsULONGLONG ); WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTBA, erstba.AsULONGLONG); WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTBA + 1, erstba.AsULONGLONG >> 32); // intially enque and deque are equal. - erstdp.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing); - erstdp.DequeueERSTIndex =0; - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP + 1, erstdp.AsULONGLONG >> 32); + + + for(int i=0; i<16; i++){ + HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word0=0; + HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word1=0; + HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word2=0; + HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word3=0; + } //DbgBreakPoint(); return MP_STATUS_SUCCESS; @@ -218,8 +346,11 @@ PXHCI_EXTENSION XhciExtension; PULONG BaseIoAdress; PULONG OperationalRegs; - PULONG RunTimeRegisterBase; - + PULONG RunTimeRegisterBase; + PULONG DoorBellRegisterBase; + XHCI_CAPLENGHT_INTERFACE_VERSION CapLenReg; + + XHCI_DOORBELL_OFFSET DoorBellOffsetRegister; MPSTATUS MPStatus; XHCI_USB_COMMAND Command; XHCI_RT_REGISTER_SPACE_OFFSET RTSOffsetRegister; @@ -241,17 +372,25 @@ BaseIoAdress = (PULONG)Resources->ResourceBase; XhciExtension->BaseIoAdress = BaseIoAdress; - CapabilityRegLength = (UCHAR)READ_REGISTER_ULONG(BaseIoAdress); + CapLenReg.AsULONG = READ_REGISTER_ULONG(BaseIoAdress); + CapLenReg.Rsvd=0; + CapLenReg.HostControllerInterfaceVersion=0; + CapabilityRegLength= (UCHAR)CapLenReg.CapabilityRegistersLength ; OperationalRegs = (PULONG)((ULONG_PTR)BaseIoAdress + CapabilityRegLength); XhciExtension->OperationalRegs = OperationalRegs; - + + DoorBellOffsetRegister.AsULONG = READ_REGISTER_ULONG(BaseIoAdress + XHCI_DBOFF); + DoorBellRegisterBase = (PULONG)((PBYTE)BaseIoAdress + DoorBellOffsetRegister.AsULONG ); + XhciExtension->DoorBellRegisterBase = DoorBellRegisterBase; + RTSOffsetRegister.AsULONG = READ_REGISTER_ULONG(BaseIoAdress + XHCI_RTSOFF); - RunTimeRegisterBase = BaseIoAdress + RTSOffsetRegister.AsULONG ; - - XhciExtension->RunTimeRegisterBase = RunTimeRegisterBase; + RunTimeRegisterBase = (PULONG)((PBYTE)BaseIoAdress + RTSOffsetRegister.AsULONG ); + XhciExtension->RunTimeRegisterBase = RunTimeRegisterBase ; DPRINT("XHCI_StartController: BaseIoAdress - %p\n", BaseIoAdress); DPRINT("XHCI_StartController: OperationalRegs - %p\n", OperationalRegs); + DPRINT("XHCI_StartController: DoorBellRegisterBase - %p\n", DoorBellRegisterBase); + DPRINT("XHCI_StartController: RunTimeRegisterBase - %p\n", RunTimeRegisterBase); RegPacket.UsbPortReadWriteConfigSpace(XhciExtension, 1, @@ -279,11 +418,15 @@ return MPStatus; } + Command.AsULONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD); Command.RunStop =1; WRITE_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD, Command.AsULONG ); + + MPStatus = XHCI_ControllerWorkTest(XhciExtension,Resources->StartVA, Resources->StartPA ); //DPRINT1("XHCI_StartController: UNIMPLEMENTED. FIXME\n"); return MP_STATUS_SUCCESS; } + VOID NTAPI @@ -474,15 +617,22 @@ DPRINT1("XHCI_EnableInterrupts: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; + PULONG RunTimeRegisterBase; + XHCI_INTERRUPTER_MANAGEMENT Iman; XHCI_USB_COMMAND usbCommand; - + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; OperationalRegs = XhciExtension->OperationalRegs; - usbCommand.AsULONG =READ_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD); + //usbCommand.AsULONG =READ_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD); + RunTimeRegisterBase = XhciExtension -> RunTimeRegisterBase; + Iman.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN) ; + Iman.InterruptEnable = 1; + WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_IMAN , Iman.AsULONG); + + //usbCommand.InterrupterEnable = 1; - usbCommand.InterrupterEnable = 1; - - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); + //WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); DPRINT1("XHCI_EnableInterrupts: Interrupts enabled\n"); } Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Thu Jul 13 06:53:28 2017 @@ -42,29 +42,30 @@ }; ULONG AsULONG; } XHCI_LINK_TRB; +//----------------------------------------generic trb---------------------------------------------------------------- +typedef struct _XHCI_GENERIC_TRB { + ULONG Word0; + ULONG Word1; + ULONG Word2; + ULONG Word3; +}XHCI_GENERIC_TRB, *PXHCI_GENERIC_TRB; //----------------------------------------Command TRBs---------------------------------------------------------------- -typedef union _XHCI_COMMAND_NO_OP_TRB { - struct { - ULONG RsvdZ1 : 5; - }; - struct { - ULONG RsvdZ2 : 5; - }; - struct { - ULONG RsvdZ3 : 5; - }; - struct { - ULONG CycleBit : 1; - ULONG RsvdZ4 : 4; - ULONG TRBType : 6; - ULONG RsvdZ5 : 14; - }; - ULONG AsULONG; +typedef struct _XHCI_COMMAND_NO_OP_TRB { + ULONG RsvdZ1; + ULONG RsvdZ2; + ULONG RsvdZ3; + struct{ + ULONG CycleBit : 1; + ULONG RsvdZ4 : 4; + ULONG TRBType : 6; + ULONG RsvdZ5 : 14; + }; } XHCI_COMMAND_NO_OP_TRB; typedef union _XHCI_COMMAND_TRB { - XHCI_COMMAND_NO_OP_TRB NoOperation[4]; + XHCI_COMMAND_NO_OP_TRB NoOperation; XHCI_LINK_TRB Link[4]; + XHCI_GENERIC_TRB GenericTRB; }XHCI_COMMAND_TRB, *PXHCI_COMMAND_TRB; typedef struct _XHCI_COMMAND_RING { @@ -170,8 +171,11 @@ typedef struct _XHCI_EVENT_RING_SEGMENT_TABLE{ ULONGLONG RingSegmentBaseAddr; - ULONGLONG RingSegmentSize : 16; - ULONGLONG RsvdZ : 48; + struct { + ULONGLONG RingSegmentSize : 16; + ULONGLONG RsvdZ : 48; + }; + } XHCI_EVENT_RING_SEGMENT_TABLE; //------------------------------------main structs----------------------- @@ -184,7 +188,7 @@ } XHCI_TRB, *PXHCI_TRB; typedef struct _XHCI_RING { - XHCI_TRB ring[16]; + XHCI_TRB XhciTrb[16]; //PXHCI_TRB dequeue_pointer; }XHCI_RING , *PXHCI_RING; @@ -194,6 +198,7 @@ PULONG BaseIoAdress; PULONG OperationalRegs; PULONG RunTimeRegisterBase; + PULONG DoorBellRegisterBase; UCHAR FrameLengthAdjustment; BOOLEAN IsStarted; USHORT HcSystemErrors; @@ -205,8 +210,9 @@ typedef struct _XHCI_HC_RESOURCES { XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY DCBAA; - XHCI_COMMAND_RING CommandRing; + //XHCI_COMMAND_RING CommandRing; XHCI_RING EventRing; + XHCI_RING CommandRing; XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; } XHCI_HC_RESOURCES, *PXHCI_HC_RESOURCES;

7 years, 5 months

[jimtabor] 75326: [Win32SS] - Remove old GDI structure and use the new one.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 13 01:59:41 2017 New Revision: 75326 URL: http://svn.reactos.org/svn/reactos?rev=75326&view=rev Log: [Win32SS] - Remove old GDI structure and use the new one. Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/clip.c trunk/reactos/win32ss/gdi/eng/engobjects.h trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/gdi/eng/gradient.c trunk/reactos/win32ss/gdi/eng/stretchblt.c trunk/reactos/win32ss/gdi/eng/transblt.c trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/polyfill.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/alphablend… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -212,7 +212,7 @@ //ASSERT(pBlendObj); /* If no clip object is given, use trivial one */ - if (!pco) pco = &gxcoTrivial.ClipObj; + if (!pco) pco = (CLIPOBJ *)&gxcoTrivial; /* Check if there is anything to draw */ if ((pco->rclBounds.left >= pco->rclBounds.right) || Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -16,16 +16,15 @@ { /* CLIPOBJ */ { - { - 0, /* iUniq */ - {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, /* rclBounds */ - DC_TRIVIAL, /* idCOmplexity */ - FC_RECT, /* iFComplexity */ - TC_RECTANGLES, /* iMode */ - 0 /* fjOptions */ - }, + 0, /* iUniq */ + {LONG_MIN, LONG_MIN, LONG_MAX, LONG_MAX}, /* rclBounds */ + DC_TRIVIAL, /* idCOmplexity */ + FC_RECT, /* iFComplexity */ + TC_RECTANGLES, /* iMode */ + 0 /* fjOptions */ }, - 0, 0, 0 + { 0, {0,0,0,0}, 0}, + 0, {0,0,0,0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; typedef BOOLEAN (APIENTRY *PBLTRECTFUNC)(SURFOBJ* OutputObj, @@ -649,7 +648,7 @@ pco = NULL; } else - pco = &gxcoTrivial.ClipObj; + pco = (CLIPOBJ *)&gxcoTrivial; if (ROP4_USES_SOURCE(Rop4)) { Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -157,13 +157,13 @@ FASTCALL IntEngInitClipObj(XCLIPOBJ *Clip) { - Clip->Rects = &Clip->ClipObj.rclBounds; + Clip->Rects = &Clip->rclBounds; } VOID FASTCALL IntEngFreeClipResources(XCLIPOBJ *Clip) { - if (Clip->Rects != &Clip->ClipObj.rclBounds) + if (Clip->Rects != &Clip->rclBounds) EngFreeMem(Clip->Rects); } @@ -183,34 +183,34 @@ if(NewRects != NULL) { Clip->RectCount = count; - Clip->EnumOrder = CD_ANY; + Clip->iDirection = CD_ANY; RtlCopyMemory(NewRects, pRect, count * sizeof(RECTL)); - Clip->ClipObj.iDComplexity = DC_COMPLEX; - Clip->ClipObj.iFComplexity = ((Clip->RectCount <= 4) ? FC_RECT4 : FC_COMPLEX); - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; - - if (Clip->Rects != &Clip->ClipObj.rclBounds) + Clip->iDComplexity = DC_COMPLEX; + Clip->iFComplexity = ((Clip->RectCount <= 4) ? FC_RECT4 : FC_COMPLEX); + Clip->iMode = TC_RECTANGLES; + Clip->rclBounds = *rcBounds; + + if (Clip->Rects != &Clip->rclBounds) EngFreeMem(Clip->Rects); Clip->Rects = NewRects; } } else { - Clip->EnumOrder = CD_ANY; - - Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && + Clip->iDirection = CD_ANY; + + Clip->iDComplexity = (((rcBounds->top == rcBounds->bottom) && (rcBounds->left == rcBounds->right)) ? DC_TRIVIAL : DC_RECT); - Clip->ClipObj.iFComplexity = FC_RECT; - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; + Clip->iFComplexity = FC_RECT; + Clip->iMode = TC_RECTANGLES; + Clip->rclBounds = *rcBounds; Clip->RectCount = 1; - if (Clip->Rects != &Clip->ClipObj.rclBounds) + if (Clip->Rects != &Clip->rclBounds) EngFreeMem(Clip->Rects); - Clip->Rects = &Clip->ClipObj.rclBounds; + Clip->Rects = &Clip->rclBounds; } } @@ -226,7 +226,7 @@ { IntEngInitClipObj(Clip); TRACE("Created Clip Obj %p.\n", Clip); - return &Clip->ClipObj; + return (CLIPOBJ *)Clip; } ERR("Clip object allocation failed!\n"); @@ -241,7 +241,7 @@ EngDeleteClip( _In_ _Post_ptr_invalid_ CLIPOBJ *pco) { - XCLIPOBJ* pxco = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + XCLIPOBJ* pxco = (XCLIPOBJ *)pco; TRACE("Deleting %p.\n", pco); IntEngFreeClipResources(pxco); EngFreeMem(pxco); @@ -259,13 +259,15 @@ _In_ ULONG iDirection, _In_ ULONG cMaxRects) { - XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + XCLIPOBJ* Clip = (XCLIPOBJ *)pco; SORTCOMP CompareFunc; + Clip->bAll = bAll; + Clip->iType = iType; Clip->EnumPos = 0; Clip->EnumMax = (cMaxRects > 0) ? cMaxRects : Clip->RectCount; - if (CD_ANY != iDirection && Clip->EnumOrder != iDirection) + if (CD_ANY != iDirection && Clip->iDirection != iDirection) { switch (iDirection) { @@ -287,7 +289,7 @@ default: ERR("Invalid iDirection %lu\n", iDirection); - iDirection = Clip->EnumOrder; + iDirection = Clip->iDirection; CompareFunc = NULL; break; } @@ -297,7 +299,7 @@ EngSort((PBYTE) Clip->Rects, sizeof(RECTL), Clip->RectCount, CompareFunc); } - Clip->EnumOrder = iDirection; + Clip->iDirection = iDirection; } /* Return the number of rectangles enumerated */ @@ -320,7 +322,7 @@ _Out_bytecap_(cj) ULONG *pulEnumRects) { const RECTL* src; - XCLIPOBJ* Clip = CONTAINING_RECORD(pco, XCLIPOBJ, ClipObj); + XCLIPOBJ* Clip = (XCLIPOBJ *)pco; ULONG nCopy; ENUMRECTS* pERects = (ENUMRECTS*)pulEnumRects; Modified: trunk/reactos/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engobjects… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engobjects.h [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -39,63 +39,68 @@ ---------------------------------------------------------------------------*/ -/* EXtended CLip and Window Region Object */ +typedef struct _RWNDOBJ { + PVOID pvConsumer; + RECTL rclClient; + SURFOBJ *psoOwner; +} RWNDOBJ; + +/* EXtended CLip and Window Region Objects */ #ifdef __cplusplus -typedef struct _XCLIPOBJ : _WNDOBJ +typedef struct _XCLIPOBJ : _CLIPOBJ, _RWNDOBJ { #else typedef struct _XCLIPOBJ { - WNDOBJ; + CLIPOBJ; + RWNDOBJ; #endif - PVOID pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */ + struct _REGION *pClipRgn; /* prgnRao_ or (prgnVis_ if (prgnRao_ == z)) */ + // RECTL rclClipRgn; - PVOID pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */ + //PVOID pscanClipRgn; /* Ptr to regions rect buffer based on iDirection. */ + RECTL* Rects; DWORD cScan; DWORD reserved; - ULONG ulBSize; + ULONG EnumPos; LONG lscnSize; - ULONG ulObjSize; + ULONG EnumMax; ULONG iDirection; - ULONG ulClipType; + ULONG iType; DWORD reserved1; LONG lUpDown; DWORD reserved2; - BOOL bShouldDoAll; - DWORD nComplexity; /* count/mode based on # of rect in regions scan. */ + BOOL bAll; + // + DWORD RectCount; /* count/mode based on # of rect in regions scan. */ PVOID pDDA; /* Pointer to a large drawing structure. */ } XCLIPOBJ, *PXCLIPOBJ; + /* - EngCreateClip allocates XCLIPOBJ and RGNOBJ, pco->co.pClipRgn = &pco->ro. + EngCreateClip allocates XCLIPOBJ and REGION, pco->co.pClipRgn = &pco->ro. { XCLIPOBJ co; - RGNOBJ ro; + REGION ro; } */ -typedef struct _CLIPGDI { - union - { - CLIPOBJ ClipObj; - WNDOBJ WndObj; - }; - /* WNDOBJ part */ + +extern XCLIPOBJ gxcoTrivial; + +#ifdef __cplusplus +typedef struct _EWNDOBJ : _XCLIPOBJ +{ +#else +typedef struct _EWNDOBJ +{ + XCLIPOBJ; +#endif + /* Extended WNDOBJ part */ HWND Hwnd; WNDOBJCHANGEPROC ChangeProc; FLONG Flags; int PixelFormat; - /* CLIPOBJ part */ - ULONG EnumPos; - ULONG EnumOrder; - ULONG EnumMax; - ULONG RectCount; - RECTL* Rects; -} CLIPGDI, *PCLIPGDI; -C_ASSERT(FIELD_OFFSET(CLIPGDI, ClipObj) == FIELD_OFFSET(CLIPGDI, WndObj.coClient)); +} EWNDOBJ, *PEWNDOBJ; -// HACK, until we use the original structure -#define XCLIPOBJ CLIPGDI - -extern XCLIPOBJ gxcoTrivial; /*ei What is this for? */ typedef struct _DRVFUNCTIONSGDI { Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -18,7 +18,7 @@ VOID FASTCALL IntEngWndCallChangeProc( - _In_ XCLIPOBJ *Clip, + _In_ EWNDOBJ *Clip, _In_ FLONG flChanged) { if (Clip->ChangeProc == NULL) @@ -40,7 +40,7 @@ if (flChanged == WOC_CHANGED) Clip->ChangeProc(NULL, flChanged); else - Clip->ChangeProc(&Clip->WndObj, flChanged); + Clip->ChangeProc((WNDOBJ *)Clip, flChanged); } /* @@ -49,7 +49,7 @@ BOOLEAN FASTCALL IntEngWndUpdateClipObj( - XCLIPOBJ* Clip, + EWNDOBJ* Clip, PWND Window) { PREGION visRgn; @@ -61,7 +61,7 @@ { if (visRgn->rdh.nCount > 0) { - IntEngUpdateClipRegion(Clip, visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); + IntEngUpdateClipRegion((XCLIPOBJ*)Clip, visRgn->rdh.nCount, visRgn->Buffer, &visRgn->rdh.rcBound); TRACE("Created visible region with %lu rects\n", visRgn->rdh.nCount); TRACE(" BoundingRect: %d, %d %d, %d\n", visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, @@ -81,12 +81,12 @@ else { /* Fall back to client rect */ - IntEngUpdateClipRegion(Clip, 1, &Window->rcClient, &Window->rcClient); + IntEngUpdateClipRegion((XCLIPOBJ*)Clip, 1, &Window->rcClient, &Window->rcClient); } /* Update the WNDOBJ */ - Clip->WndObj.rclClient = Window->rcClient; - Clip->WndObj.coClient.iUniq++; + Clip->rclClient = Window->rcClient; + Clip->iUniq++; return TRUE; } @@ -100,7 +100,7 @@ _In_ PWND Window, _In_ FLONG flChanged) { - XCLIPOBJ *Clip; + EWNDOBJ *Clip; ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); @@ -111,7 +111,7 @@ } ASSERT(Clip->Hwnd == Window->head.h); - // if (Clip->WndObj.pvConsumer != NULL) + // if (Clip->pvConsumer != NULL) { /* Update the WNDOBJ */ switch (flChanged) @@ -149,7 +149,7 @@ FLONG fl, int iPixelFormat) { - XCLIPOBJ *Clip = NULL; + EWNDOBJ *Clip = NULL; WNDOBJ *WndObjUser = NULL; PWND Window; BOOL calledFromUser; @@ -176,13 +176,13 @@ } /* Create WNDOBJ */ - Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof (XCLIPOBJ), GDITAG_WNDOBJ); + Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof (EWNDOBJ), GDITAG_WNDOBJ); if (Clip == NULL) { ERR("Failed to allocate memory for a WND structure!\n"); RETURN( NULL); } - IntEngInitClipObj(Clip); + IntEngInitClipObj((XCLIPOBJ*)Clip); /* Fill the clipobj */ if (!IntEngWndUpdateClipObj(Clip, Window)) @@ -192,7 +192,7 @@ } /* Fill user object */ - WndObjUser = &Clip->WndObj; + WndObjUser = (WNDOBJ *)Clip; WndObjUser->psoOwner = pso; WndObjUser->pvConsumer = NULL; @@ -233,7 +233,7 @@ EngDeleteWnd( IN WNDOBJ *pwo) { - XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); + EWNDOBJ* Clip = (EWNDOBJ *)pwo;//CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); PWND Window; BOOL calledFromUser; @@ -262,7 +262,7 @@ } /* Free resources */ - IntEngFreeClipResources(Clip); + IntEngFreeClipResources((XCLIPOBJ*)Clip); EngFreeMem(Clip); } @@ -308,7 +308,7 @@ IN WNDOBJ *pwo, IN PVOID pvConsumer) { - XCLIPOBJ* Clip = CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); + EWNDOBJ* Clip = (EWNDOBJ *)pwo;//CONTAINING_RECORD(pwo, XCLIPOBJ, WndObj); BOOL Hack; TRACE("WNDOBJ_vSetConsumer: pwo = 0x%p, pvConsumer = 0x%p\n", pwo, pvConsumer); Modified: trunk/reactos/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/gradient.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -491,7 +491,7 @@ if (pco == NULL) { /* Use the trivial one instead */ - pco = &gxcoTrivial.ClipObj; + pco = (CLIPOBJ *)&gxcoTrivial;//.coClient; } switch(ulMode) Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stretchblt… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -390,7 +390,7 @@ //ASSERT(!RECTL_bIsEmptyRect(SourceRect)); // FIXME! /* If no clip object is given, use trivial one */ - if (!ClipRegion) ClipRegion = &gxcoTrivial.ClipObj; + if (!ClipRegion) ClipRegion = (CLIPOBJ *)&gxcoTrivial; psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); Modified: trunk/reactos/win32ss/gdi/eng/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/transblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/transblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/transblt.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -232,7 +232,7 @@ ASSERT(psurfSource); /* If no clip object is given, use trivial one */ - if (!Clip) Clip = &gxcoTrivial.ClipObj; + if (!Clip) Clip = (CLIPOBJ *)&gxcoTrivial; InputClippedRect = *DestRect; if (InputClippedRect.right < InputClippedRect.left) Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -8,7 +8,7 @@ */ #define PUTPIXEL(x,y,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - &dc->co.ClipObj, \ + (CLIPOBJ *)&dc->co, \ &BrushInst.BrushObject, \ x, y, (x)+1, y, \ &RectBounds, \ @@ -16,7 +16,7 @@ #define PUTLINE(x1,y1,x2,y2,BrushInst) \ ret = ret && IntEngLineTo(&psurf->SurfObj, \ - &dc->co.ClipObj, \ + (CLIPOBJ *)&dc->co, \ &BrushInst.BrushObject, \ x1, y1, x2, y2, \ &RectBounds, \ Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -130,7 +130,7 @@ TRACE("Performing the alpha blend\n"); bResult = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - &DCDest->co.ClipObj, + (CLIPOBJ *)&DCDest->co, &exlo.xlo, &DestRect, &SourceRect, @@ -295,7 +295,7 @@ EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - &DCDest->co.ClipObj, &exlo.xlo, &rcDest, &rcSrc, + (CLIPOBJ *)&DCDest->co, &exlo.xlo, &rcDest, &rcSrc, TransparentColor, 0); EXLATEOBJ_vCleanup(&exlo); @@ -485,12 +485,11 @@ XlateObj = &exlo.xlo; } - /* Perform the bitblt operation */ Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, psurfMask ? &psurfMask->SurfObj : NULL, - &DCDest->co.ClipObj, + (CLIPOBJ *)&DCDest->co, XlateObj, &DestRect, &SourcePoint, @@ -708,7 +707,7 @@ Status = IntEngStretchBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, BitmapMask ? &BitmapMask->SurfObj : NULL, - &DCDest->co.ClipObj, + (CLIPOBJ *)&DCDest->co, XlateObj, &DCDest->dclevel.ca, &DestRect, @@ -848,7 +847,7 @@ ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - &pdc->co.ClipObj, + (CLIPOBJ *)&pdc->co, NULL, &DestRect, NULL, @@ -1105,7 +1104,7 @@ bResult = IntEngBitBlt(&pdc->dclevel.pSurface->SurfObj, NULL, NULL, - &xcoClip.ClipObj, + (CLIPOBJ *)&xcoClip, NULL, &prgnClip->rdh.rcBound, NULL, @@ -1210,7 +1209,7 @@ /* Call the internal function */ bRet = IntEngPaint(&pdc->dclevel.pSurface->SurfObj, - &xcoClip.ClipObj, + (CLIPOBJ *)&xcoClip, pbo, &pdc->pdcattr->ptlBrushOrigin, mix); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -635,7 +635,7 @@ Status = IntEngBitBlt(pDestSurf, pSourceSurf, pMaskSurf, - &pDC->co.ClipObj, + (CLIPOBJ *)&pDC->co, &exlo.xlo, &rcDest, &ptSource, @@ -1333,7 +1333,7 @@ bResult = IntEngStretchBlt(&psurfDst->SurfObj, &psurfTmp->SurfObj, NULL, - &pdc->co.ClipObj, + (CLIPOBJ *)&pdc->co, &exlo.xlo, &pdc->dclevel.ca, &rcDst, Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -1288,7 +1288,7 @@ &psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &DestRect, NULL, Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -115,7 +115,7 @@ // Points[1].x, Points[1].y ); ret = IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, Points[i].x, /* From */ Points[i].y, @@ -129,7 +129,7 @@ if (ret) { ret = IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, Points[Count-1].x, /* From */ Points[Count-1].y, @@ -611,7 +611,7 @@ ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &DestRect, NULL, @@ -630,28 +630,28 @@ { Mix = ROP2_TO_MIX(pdcattr->jROP2); ret = ret && IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle @@ -963,7 +963,7 @@ EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0); bRet = IntEngGradientFill(&psurf->SurfObj, - &pdc->co.ClipObj, + (CLIPOBJ *)&pdc->co, &exlo.xlo, pVertex, nVertex, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -5170,7 +5170,7 @@ &psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &DestRect, &SourcePoint, @@ -5440,7 +5440,7 @@ &psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &DestRect, &SourcePoint, @@ -5576,7 +5576,7 @@ &psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &DestRect, &SourcePoint, @@ -5649,7 +5649,7 @@ if (!IntEngMaskBlt( SurfObj, SourceGlyphSurf, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &exloRGB2Dst.xlo, &exloDst2RGB.xlo, &DestRect, @@ -5686,7 +5686,7 @@ for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) { EngLineTo(SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboText.BrushObject, (TextLeft >> 6), TextTop + yoff - position + i, @@ -5702,7 +5702,7 @@ for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) { EngLineTo(SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboText.BrushObject, (TextLeft >> 6), TextTop + yoff - (fixAscender >> 6) / 3 + i, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -202,7 +202,7 @@ if (!(pbrLine->flAttrs & BR_IS_NULL)) { Ret = IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, Points[0].x, Points[0].y, Points[1].x, Points[1].y, @@ -334,7 +334,7 @@ } Ret = IntEngPolyline(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, &dc->eboLine.BrushObject, Points, Count, Modified: trunk/reactos/win32ss/gdi/ntgdi/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/polyfill… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -417,7 +417,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, BrushObj, x1, ScanLine, @@ -489,7 +489,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, BrushObj, x1, ScanLine, @@ -514,7 +514,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); IntEngLineTo(&psurf->SurfObj, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, BrushObj, x1, ScanLine, @@ -641,7 +641,7 @@ IntEngBitBlt(&psurf->SurfObj, NULL, NULL, - &dc->co.ClipObj, + (CLIPOBJ *)&dc->co, NULL, &LineRect, NULL, Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -1863,7 +1863,7 @@ /* We now have our destination surface */ psurfDest = psurfOffScreen; #else - pdcClipObj = &pdc->co.ClipObj; + pdcClipObj = (CLIPOBJ *)&pdc->co; /* Paint the brush */ EBRUSHOBJ_vInit(&eboFill, pbrush, psurfDest, 0x00FFFFFF, 0, NULL); @@ -1894,7 +1894,7 @@ { /* We directly draw to the DC */ TRACE("Performing on screen rendering.\n"); - pdcClipObj = &pdc->co.ClipObj; + pdcClipObj = (CLIPOBJ *)&pdc->co; // psurfOffScreen = NULL; } Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Thu Jul 13 01:59:41 2017 @@ -951,7 +951,7 @@ HWND FASTCALL UserGethWnd( HDC hdc, PWNDOBJ *pwndo) { - XCLIPOBJ* Clip; + EWNDOBJ* Clip; PWND Wnd; HWND hWnd; @@ -959,11 +959,11 @@ if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { - Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj, TRUE); + Clip = (EWNDOBJ*)UserGetProp(Wnd, AtomWndObj, TRUE); if ( Clip && Clip->Hwnd == hWnd ) { - if (pwndo) *pwndo = &Clip->WndObj; + if (pwndo) *pwndo = (PWNDOBJ)Clip; } } return hWnd;

7 years, 5 months

[hbelusca] 75325: [SHELL32]: Enable showing the sorting arrows in the sorting header column of shell folder listviews. CORE-11776 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jul 13 00:21:32 2017 New Revision: 75325 URL: http://svn.reactos.org/svn/reactos?rev=75325&view=rev Log: [SHELL32]: Enable showing the sorting arrows in the sorting header column of shell folder listviews. CORE-11776 #resolve Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Jul 13 00:21:32 2017 @@ -103,10 +103,11 @@ BOOL m_isEditing; CLSID m_Category; - BOOL m_Destroyed; + BOOL m_Destroyed; + private: - HRESULT _MergeToolbar(); + BOOL _Sort(); public: CDefView(); @@ -688,6 +689,40 @@ return nDiff; } +BOOL CDefView::_Sort() +{ + HWND hHeader; + HDITEM hColumn; + + if ((m_ListView.GetWindowLongPtr(GWL_STYLE) & ~LVS_NOSORTHEADER) == 0) + return TRUE; + + hHeader = (HWND)m_ListView.SendMessage(LVM_GETHEADER, 0, 0); + ZeroMemory(&hColumn, sizeof(hColumn)); + + /* If the sorting column changed, remove the sorting style from the old column */ + if ( (m_sortInfo.nLastHeaderID != -1) && + (m_sortInfo.nLastHeaderID != m_sortInfo.nHeaderID) ) + { + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, m_sortInfo.nLastHeaderID, &hColumn); + hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN); + Header_SetItem(hHeader, m_sortInfo.nLastHeaderID, &hColumn); + } + + /* Set the sorting style to the new column */ + hColumn.mask = HDI_FORMAT; + Header_GetItem(hHeader, m_sortInfo.nHeaderID, &hColumn); + + hColumn.fmt &= (m_sortInfo.bIsAscending ? ~HDF_SORTDOWN : ~HDF_SORTUP ); + hColumn.fmt |= (m_sortInfo.bIsAscending ? HDF_SORTUP : HDF_SORTDOWN); + Header_SetItem(hHeader, m_sortInfo.nHeaderID, &hColumn); + + /* Sort the list, using the current values of nHeaderID and bIsAscending */ + m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; + return m_ListView.SortItems(ListViewCompareItems, this); +} + PCUITEMID_CHILD CDefView::_PidlByItem(int i) { return reinterpret_cast<PCUITEMID_CHILD>(m_ListView.GetItemData(i)); @@ -906,8 +941,7 @@ FIXME("no m_pSF2Parent\n"); } m_sortInfo.bIsAscending = TRUE; - m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; - m_ListView.SortItems(ListViewCompareItems, this); + _Sort(); /*turn the listview's redrawing back on and force it to draw*/ m_ListView.SetRedraw(TRUE); @@ -1525,15 +1559,14 @@ CheckToolbar(); break; - /* the menu-ID's for sorting are 0x30... see shrec.rc */ + /* the menu-ID's for sorting are 0x30... see shrec.rc */ case 0x30: case 0x31: case 0x32: case 0x33: m_sortInfo.nHeaderID = dwCmdID - 0x30; m_sortInfo.bIsAscending = TRUE; - m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; - m_ListView.SortItems(ListViewCompareItems, this); + _Sort(); break; case FCIDM_SHVIEW_SNAPTOGRID: @@ -1669,9 +1702,7 @@ m_sortInfo.bIsAscending = !m_sortInfo.bIsAscending; else m_sortInfo.bIsAscending = TRUE; - m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; - - m_ListView.SortItems(ListViewCompareItems, this); + _Sort(); break; case LVN_GETDISPINFOA:

7 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2017