Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[ekohl] 56214: [DEVMGMT] Implement the "Show hidden devices" feature.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Mar 22 22:38:06 2012 New Revision: 56214 URL: http://svn.reactos.org/svn/reactos?rev=56214&view=rev Log: [DEVMGMT] Implement the "Show hidden devices" feature. Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h trunk/reactos/base/applications/mscutils/devmgmt/resource.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -136,11 +136,13 @@ static INT EnumDeviceClasses(INT ClassIndex, + BOOL ShowHidden, LPTSTR DevClassName, LPTSTR DevClassDesc, BOOL *DevPresent, INT *ClassImage, - BOOL *IsUnknown) + BOOL *IsUnknown, + BOOL *IsHidden) { GUID ClassGuid; HKEY KeyClass; @@ -150,6 +152,7 @@ *DevPresent = FALSE; *DevClassName = _T('\0'); + *IsHidden = FALSE; Ret = CM_Enumerate_Classes(ClassIndex, &ClassGuid, @@ -172,6 +175,11 @@ /* This case is special because these devices don't show up with normal class enumeration */ *IsUnknown = IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_UNKNOWN); + + if (ShowHidden == FALSE && + (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) + *IsHidden = TRUE; if (SetupDiClassNameFromGuid(&ClassGuid, ClassName, @@ -327,7 +335,8 @@ VOID ListDevicesByType(HWND hTreeView, - HTREEITEM hRoot) + HTREEITEM hRoot, + BOOL bShowHidden) { HTREEITEM hDevItem; TCHAR DevName[MAX_DEV_LEN]; @@ -338,17 +347,20 @@ INT index = 0; INT DevImage; BOOL IsUnknown = FALSE; + BOOL IsHidden = FALSE; do { ClassRet = EnumDeviceClasses(index, + bShowHidden, DevName, DevDesc, &DevExist, &DevImage, - &IsUnknown); - - if ((ClassRet != -1) && (DevExist)) + &IsUnknown, + &IsHidden); + + if ((ClassRet != -1) && (DevExist) && !IsHidden) { TCHAR DeviceName[MAX_DEV_LEN]; INT DevIndex = 0; @@ -442,7 +454,8 @@ static HTREEITEM AddDeviceToTree(HWND hTreeView, HTREEITEM hRoot, - DEVINST dnDevInst) + DEVINST dnDevInst, + BOOL bShowHidden) { TCHAR DevName[MAX_DEV_LEN]; TCHAR FriendlyName[MAX_DEV_LEN]; @@ -452,6 +465,28 @@ LPTSTR DeviceID; INT ClassImage = 24; CONFIGRET cr; + + ulLength = MAX_GUID_STRING_LEN * sizeof(TCHAR); + cr = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidString, + &ulLength, + 0); + if (cr == CR_SUCCESS) + { + pSetupGuidFromString(ClassGuidString, &ClassGuid); + + if (bShowHidden == FALSE && + (IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_LEGACYDRIVER) || + IsEqualGUID(&ClassGuid, &GUID_DEVCLASS_VOLUME))) + return NULL; + } + else + { + /* It's a device with no driver */ + ClassGuid = GUID_DEVCLASS_UNKNOWN; + } cr = CM_Get_Device_ID(dnDevInst, DevName, @@ -480,23 +515,6 @@ return NULL; } - ulLength = MAX_GUID_STRING_LEN * sizeof(TCHAR); - cr = CM_Get_DevNode_Registry_Property(dnDevInst, - CM_DRP_CLASSGUID, - NULL, - ClassGuidString, - &ulLength, - 0); - if (cr == CR_SUCCESS) - { - pSetupGuidFromString(ClassGuidString, &ClassGuid); - } - else - { - /* It's a device with no driver */ - ClassGuid = GUID_DEVCLASS_UNKNOWN; - } - if (!SetupDiGetClassImageIndex(&ImageListData, &ClassGuid, &ClassImage)) @@ -532,7 +550,8 @@ static VOID EnumChildDevices(HWND hTreeView, HTREEITEM hRoot, - DEVINST dnParentDevInst) + DEVINST dnParentDevInst, + BOOL bShowHidden) { HTREEITEM hDevItem; DEVINST dnDevInst; @@ -546,13 +565,15 @@ hDevItem = AddDeviceToTree(hTreeView, hRoot, - dnDevInst); - if (hDevItem == NULL) - return; - - EnumChildDevices(hTreeView, - hDevItem, - dnDevInst); + dnDevInst, + bShowHidden); + if (hDevItem != NULL) + { + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst, + bShowHidden); + } while (cr == CR_SUCCESS) { @@ -564,13 +585,15 @@ hDevItem = AddDeviceToTree(hTreeView, hRoot, - dnDevInst); - if (hDevItem == NULL) - break; - - EnumChildDevices(hTreeView, - hDevItem, - dnDevInst); + dnDevInst, + bShowHidden); + if (hDevItem != NULL) + { + EnumChildDevices(hTreeView, + hDevItem, + dnDevInst, + bShowHidden); + } } (void)TreeView_SortChildren(hTreeView, @@ -581,7 +604,8 @@ VOID ListDevicesByConnection(HWND hTreeView, - HTREEITEM hRoot) + HTREEITEM hRoot, + BOOL bShowHidden) { DEVINST devInst; CONFIGRET cr; @@ -592,7 +616,8 @@ if (cr == CR_SUCCESS) EnumChildDevices(hTreeView, hRoot, - devInst); + devInst, + bShowHidden); (void)TreeView_Expand(hTreeView, hRoot, Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_DEVBYCONN MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´Ð°", IDC_RESBYTYPE, GRAYED MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÐÐ¾Ð¼Ð¾Ñ" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/cs-CZ.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "ZaÅÃzenÃ podle pÅipojenÃ", IDC_DEVBYCONN MENUITEM "ProstÅedky podle typu", IDC_RESBYTYPE, GRAYED MENUITEM "ProstÅedky podle pÅipojenÃ", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "NÃ¡povÄda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN @@ -20,6 +20,8 @@ MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN MENUITEM "Resourcen nach Typ", IDC_RESBYTYPE, GRAYED MENUITEM "Resourcen nach Verbindung", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ausgeblendete GerÃ¤te anzeigen", IDC_SHOWHIDDEN END POPUP "&?" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_DEVBYCONN MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_RESBYTYPE, GRAYED MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Devices by connection", IDC_DEVBYCONN MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Help" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -25,6 +25,8 @@ MENUITEM "Dispositivos por conexiÃ³n", IDC_DEVBYCONN MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED MENUITEM "Recursos por conexiÃ³n", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Ayuda" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "PÃ©riphÃ©riques par connexion", IDC_DEVBYCONN MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Aide" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/id-ID.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Device dengan koneksi", IDC_DEVBYCONN MENUITEM "Resource dengan tipe", IDC_RESBYTYPE, GRAYED MENUITEM "Resource dengan koneksi", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Bantuan" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Dispositivi per connessione", IDC_DEVBYCONN MENUITEM "Risorse per tipo", IDC_RESBYTYPE, GRAYED MENUITEM "Risorse per connessione", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Aiuto" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ãã«ã" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -24,6 +24,8 @@ MENUITEM "Devices by connection", IDC_DEVBYCONN MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ëìë§" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -20,6 +20,8 @@ MENUITEM "Enheter etter tilkobling", IDC_DEVBYCONN MENUITEM "Ressurser etter type", IDC_RESBYTYPE, GRAYED MENUITEM "Ressurser etter tilkobling", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Hjelp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -27,6 +27,8 @@ MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_DEVBYCONN MENUITEM "Zaso&by wedÅug typu", IDC_RESBYTYPE, GRAYED MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Pomo&c" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -21,6 +21,8 @@ MENUITEM "Dispozitive dupÄ &conexiune", IDC_DEVBYCONN MENUITEM "Resurse dupÄ t&ip", IDC_RESBYTYPE, GRAYED MENUITEM "Resurse dupÄ c&onexiune", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "&?" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -22,6 +22,8 @@ MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_RESBYTYPE, GRAYED MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -25,6 +25,8 @@ MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_DEVBYCONN MENUITEM "Prostriedky podÄ¾a typu", IDC_RESBYTYPE, GRAYED MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "PomocnÃk" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -27,6 +27,8 @@ MENUITEM "Enheter efter koppling", IDC_DEVBYCONN MENUITEM "Resurcer efter typ", IDC_RESBYTYPE, GRAYED MENUITEM "Resurcer efter koppling", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "HjÃ¤lp" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -28,6 +28,8 @@ MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_DEVBYCONN MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_RESBYTYPE, GRAYED MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -28,6 +28,8 @@ MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_DEVBYCONN MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_RESBYTYPE, GRAYED MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -24,6 +24,8 @@ MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_DEVBYCONN MENUITEM "èµæºï¼æç±»å", IDC_RESBYTYPE, GRAYED MENUITEM "èµæºï¼æè¿æ¥", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END POPUP "å¸®å©" BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -217,11 +217,11 @@ switch (Info->Display) { case DevicesByType: - ListDevicesByType(Info->hTreeView, hRoot); + ListDevicesByType(Info->hTreeView, hRoot, Info->bShowHidden); break; case DevicesByConnection: - ListDevicesByConnection(Info->hTreeView, hRoot); + ListDevicesByConnection(Info->hTreeView, hRoot, Info->bShowHidden); break; default: @@ -238,6 +238,9 @@ UpdateViewMenu(PMAIN_WND_INFO Info) { UINT id = IDC_DEVBYTYPE; + HMENU hMenu; + + hMenu = GetMenu(Info->hMainWnd); switch (Info->Display) { @@ -255,11 +258,15 @@ break; } - CheckMenuRadioItem(GetMenu(Info->hMainWnd), + CheckMenuRadioItem(hMenu, IDC_DEVBYTYPE, IDC_RESBYCONN, id, MF_BYCOMMAND); + + CheckMenuItem(hMenu, + IDC_SHOWHIDDEN, + MF_BYCOMMAND | (Info->bShowHidden) ? MF_CHECKED : MF_UNCHECKED); } @@ -598,6 +605,14 @@ OnRefresh(Info); } break; + + case IDC_SHOWHIDDEN: + { + Info->bShowHidden = !Info->bShowHidden; + UpdateViewMenu(Info); + OnRefresh(Info); + } + break; } } @@ -794,6 +809,7 @@ { Info->nCmdShow = nCmdShow; Info->Display = DevicesByType; + Info->bShowHidden = TRUE; hMainWnd = CreateWindowEx(WS_EX_WINDOWEDGE, szMainWndClass, Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -40,6 +40,7 @@ int nCmdShow; DISPLAY_TYPE Display; + BOOL bShowHidden; /* status flags */ UINT InMenuLoop : 1; @@ -71,8 +72,8 @@ VOID FreeDeviceStrings(HWND hTreeView); VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem); HTREEITEM InitTreeView(HWND hTreeView); -VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot); -VOID ListDevicesByConnection(HWND hTreeView, HTREEITEM hRoot); +VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot, BOOL bShowHidden); +VOID ListDevicesByConnection(HWND hTreeView, HTREEITEM hRoot, BOOL bShowHidden); /* misc.c */ Modified: trunk/reactos/base/applications/mscutils/devmgmt/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/resource.h [iso-8859-1] Thu Mar 22 22:38:06 2012 @@ -23,6 +23,7 @@ #define IDC_DEVBYCONN 105 #define IDC_RESBYTYPE 106 #define IDC_RESBYCONN 107 +#define IDC_SHOWHIDDEN 108 /* tooltips */ #define IDS_TOOLTIP_PROP 6000

12 years, 7 months

[tkreuzer] 56213: [WIN32K] - Initial implementations of IntEngBitBlt, EngBitBlt, NtGdiBitBlt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 22 20:43:31 2012 New Revision: 56213 URL: http://svn.reactos.org/svn/reactos?rev=56213&view=rev Log: [WIN32K] - Initial implementations of IntEngBitBlt, EngBitBlt, NtGdiBitBlt Added: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c (with props) Added: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c (added) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c [iso-8859-1] Thu Mar 22 20:43:31 2012 @@ -1,0 +1,576 @@ + +#include <win32k.h> +#include "../diblib/DibLib_interface.h" +DBG_DEFAULT_CHANNEL(GdiFont); + +#define SURFOBJ_flags(pso) (CONTAINING_RECORD(pso, SURFACE, SurfObj)->flags) + +#define XCLIPOBJ CLIPGDI + +XCLIPOBJ gxcoTrivial; + + +static +void +CalculateCoordinates( + PBLTDATA pbltdata, + PRECTL prclClipped, + PRECTL prclOrg, + PPOINTL pptlSrc, + PPOINTL pptlMask, + PPOINTL pptlPat, + PSIZEL psizlPat) +{ + ULONG cx, cy; + + /* Copy the target start point */ + pbltdata->siDst.ptOrig.x = prclClipped->left; + pbltdata->siDst.ptOrig.y = prclClipped->top; + + /* Calculate width and height of this rect */ + pbltdata->ulWidth = prclClipped->right - prclClipped->left; + pbltdata->ulHeight = prclClipped->bottom - prclClipped->top; + + /* Calculate start position for target */ + pbltdata->siDst.pjBase = pbltdata->siDst.pvScan0; + pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.y * pbltdata->siDst.lDelta; + pbltdata->siDst.pjBase += pbltdata->siDst.ptOrig.x * pbltdata->siDst.jBpp / 8; + + /* Calculate the offset from the original coordinates */ + cx = (prclClipped->left - prclOrg->left); + cy = (prclClipped->top - prclOrg->top); + + if (pptlSrc) + { + /* Calculate current origin for the source */ + pbltdata->siSrc.ptOrig.x = pptlSrc->x + cx; + pbltdata->siSrc.ptOrig.y = pptlSrc->y + cy; + + /* Calculate start position for source */ + pbltdata->siSrc.pjBase = pbltdata->siSrc.pvScan0; + pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.y * pbltdata->siSrc.lDelta; + pbltdata->siSrc.pjBase += pbltdata->siSrc.ptOrig.x * pbltdata->siSrc.jBpp / 8; + } + + if (pptlMask) + { + pbltdata->siMsk.ptOrig.x = pptlMask->x + cx; + pbltdata->siMsk.ptOrig.y = pptlMask->y + cy; + + /* Calculate start position for mask */ + pbltdata->siMsk.pjBase = pbltdata->siMsk.pvScan0; + pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.y * pbltdata->siMsk.lDelta; + pbltdata->siMsk.pjBase += pbltdata->siMsk.ptOrig.x * pbltdata->siMsk.jBpp / 8; + } + + if (pptlPat) + { + pbltdata->siPat.ptOrig.x = (pptlPat->x + cx) % psizlPat->cx; + pbltdata->siPat.ptOrig.y = (pptlPat->x + cy) % psizlPat->cy; + + /* Calculate start position for pattern */ + pbltdata->siPat.pjBase = pbltdata->siPat.pvScan0; + pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.y * pbltdata->siPat.lDelta; + pbltdata->siPat.pjBase += pbltdata->siPat.ptOrig.x * pbltdata->siPat.jBpp / 8; + } +} + +BOOL +APIENTRY +EngBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + BLTDATA bltdata; + ULONG i, iFunctionIndex, iDirection = CD_ANY; + RECTL rcTrg; + PFN_DIBFUNCTION pfnBitBlt; + BOOL bEnumMore; + RECT_ENUM rcenum; + PSIZEL psizlPat; + +__debugbreak(); + + ASSERT(psoTrg); + ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + ASSERT(prclTrg); + ASSERT(prclTrg->left >= 0); + ASSERT(prclTrg->top >= 0); + ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); + ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + + rcTrg = *prclTrg; + + bltdata.rop4 = rop4; + bltdata.pxlo = pxlo; + bltdata.pfnXlate = XLATEOBJ_pfnXlate(pxlo); + + bltdata.siDst.pvScan0 = psoTrg->pvScan0; + bltdata.siDst.lDelta = psoTrg->lDelta; + bltdata.siDst.jBpp = gajBitsPerFormat[psoTrg->iBitmapFormat]; + + /* Check if the ROP uses a source */ + if (ROP4_USES_SOURCE(rop4)) + { + /* Sanity checks */ + ASSERT(psoSrc); + ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); + ASSERT(psoSrc->iBitmapFormat <= BMF_32BPP); + ASSERT(pptlSrc); + ASSERT(pptlSrc->x >= 0); + ASSERT(pptlSrc->y >= 0); + ASSERT(pptlSrc->x <= psoSrc->sizlBitmap.cx); + ASSERT(pptlSrc->y <= psoSrc->sizlBitmap.cy); + + bltdata.siSrc.pvScan0 = psoSrc->pvScan0; + bltdata.siSrc.lDelta = psoSrc->lDelta; + bltdata.siSrc.jBpp = gajBitsPerFormat[psoSrc->iBitmapFormat]; + + /* Check if source and target are equal */ + if (psoSrc == psoTrg) + { + /* Analyze the copying direction */ + if (rcTrg.top < pptlSrc->y) + iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTDOWN : CD_LEFTDOWN; + else + iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTUP : CD_LEFTUP; + + /* Check for special right to left case */ + if ((rcTrg.top == pptlSrc->y) && (rcTrg.left > pptlSrc->x)) + { + /* Use 0 as target format to get special right to left versions */ + bltdata.siDst.iFormat = 0; + bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; + } + else + { + /* Use 0 as source format to get special equal surface versions */ + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + bltdata.siSrc.iFormat = 0; + } + } + else + { + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; + } + } + else + { + bltdata.siDst.iFormat = psoTrg->iBitmapFormat; + } + + /* Check of the ROP uses a pattern / brush */ + if (ROP4_USES_PATTERN(rop4)) + { + /* Must have a brush */ + ASSERT(pbo); // FIXME: test this! + + /* Copy the solid color */ + bltdata.ulSolidColor = pbo->iSolidColor; + + /* Check if this is a pattern brush */ + if (pbo->iSolidColor == 0xFFFFFFFF) + { + __debugbreak(); + + // FIXME + bltdata.siPat.iFormat = 0;//psoPat->iBitmapFormat; + bltdata.siPat.pvScan0 = 0;//psoPat->pvScan0; + bltdata.siPat.lDelta = 0;//psoPat->lDelta; + + bltdata.ulPatWidth = 0; + bltdata.ulPatHeight = 0; + + psizlPat = 0;// fixme + } + else + { + pptlBrush = NULL; + psizlPat = NULL; + } + } + else + { + pptlBrush = NULL; + psizlPat = NULL; + } + + /* Check if the ROP uses a mask */ + if (ROP4_USES_MASK(rop4)) + { + /* Must have a mask surface and point */ + ASSERT(psoMask); + ASSERT(pptlMask); + + bltdata.siMsk.iFormat = psoMask->iBitmapFormat; + bltdata.siMsk.pvScan0 = psoMask->pvScan0; + bltdata.siMsk.lDelta = psoMask->lDelta; + + bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; + bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; + + ASSERT(FALSE); + // get masking function! + pfnBitBlt = 0; + } + else + { + /* Get the function index from the foreground ROP index*/ + iFunctionIndex = aiIndexPerRop[ROP4_FGND(rop4)]; + + /* Get the dib function */ + pfnBitBlt = apfnDibFunction[iFunctionIndex]; + } + + /* If no clip object is given, use trivial one */ + if (!pco) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Check if we need to enumerate rects */ + if (pco->iDComplexity == DC_COMPLEX) + { + /* Start the enumeration of the clip object */ + CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, iDirection, 0); + do + { + /* Enumerate a set of rectangles */ + bEnumMore = CLIPOBJ_bEnum(pco, sizeof(rcenum), (ULONG*)&rcenum); + + /* Loop all rectangles we got */ + for (i = 0; i < rcenum.c; i++) + { + /* Intersect this rect with the target rect */ + if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) + { + /* This rect is outside the bounds, continue */ + continue; + } + + /* Calculate the coordinates */ + CalculateCoordinates(&bltdata, + &rcenum.arcl[i], + prclTrg, + pptlSrc, + pptlMask, + pptlBrush, + psizlPat); + + /* Call the dib function */ + pfnBitBlt(&bltdata); + } + } + while (bEnumMore); + } + else + { + /* Check if there is something to clip */ + if (pco->iDComplexity == DC_RECT) + { + /* Clip the target rect to the bounds of the clipping region */ + RECTL_bIntersectRect(&rcTrg, &rcTrg, &pco->rclBounds); + } + + /* Calculate the coordinates */ + CalculateCoordinates(&bltdata, + &rcTrg, + prclTrg, + pptlSrc, + pptlMask, + pptlBrush, + psizlPat); + + /* Call the dib function */ + pfnBitBlt(&bltdata); + } + + return TRUE; +} + + +static +VOID +AdjustOffsetAndSize( + _Out_ PPOINTL pptOffset, + _Out_ PSIZEL psizTrg, + _In_ PPOINTL pptlSrc, + _In_ PSIZEL psizSrc) +{ + LONG x, y, cxMax, cyMax; + + x = pptlSrc->x + pptOffset->x; + if (x < 0) pptOffset->x -= x, x = 0; + + cxMax = psizSrc->cx - x; + if (psizTrg->cx > cxMax) psizTrg->cx= cxMax; + + y = pptlSrc->y + pptOffset->y; + if (y < 0) pptOffset->y -= y, y = 0; + + cyMax = psizSrc->cy - y; + if (psizTrg->cy > cyMax) psizTrg->cy = cyMax; +} + +BOOL +APIENTRY +IntEngBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + BOOL bResult; + RECTL rcClipped; + POINTL ptOffset, ptSrc, ptMask; + SIZEL sizTrg; + PFN_DrvBitBlt pfnBitBlt; + +//__debugbreak(); + + /* Sanity checks */ + ASSERT(IS_VALID_ROP4(rop4)); + ASSERT(psoTrg); + ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + ASSERT(prclTrg); + ASSERT(RECTL_bIsWellOrdered(prclTrg)); + + /* Clip the target rect to the extents of the target surface */ + rcClipped.left = max(prclTrg->left, 0); + rcClipped.top = max(prclTrg->top, 0); + rcClipped.right = min(prclTrg->right, psoTrg->sizlBitmap.cx); + rcClipped.bottom = min(prclTrg->bottom, psoTrg->sizlBitmap.cy); + + /* If no clip object is given, use trivial one */ + if (!pco) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Check if there is something to clip */ + if (pco->iDComplexity != DC_TRIVIAL) + { + /* Clip the target rect to the bounds of the clipping region */ + RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds); + } + + /* Don't pass a clip object with a single rectangle */ +// if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Calculate initial offset and size */ + ptOffset.x = rcClipped.left - prclTrg->left; + ptOffset.y = rcClipped.top - prclTrg->top; + sizTrg.cx = rcClipped.right - rcClipped.left; + sizTrg.cy = rcClipped.bottom - rcClipped.top; + + /* Check if the ROP uses a source */ + if (ROP4_USES_SOURCE(rop4)) + { + /* Must have a source surface and point */ + ASSERT(psoSrc); + ASSERT(pptlSrc); + + /* Get the source point */ + ptSrc = *pptlSrc; + + /* Clip against the extents of the source surface */ + AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptSrc, &psoSrc->sizlBitmap); + } + else + { + psoSrc = NULL; + ptSrc.x = 0; + ptSrc.y = 0; + } + + /* Check if the ROP uses a mask */ + if (ROP4_USES_MASK(rop4)) + { + /* Must have a mask surface and point */ + ASSERT(psoMask); + ASSERT(pptlMask); + + /* Get the mask point */ + ptMask = *pptlMask; + + /* Clip against the extents of the mask surface */ + AdjustOffsetAndSize(&ptOffset, &sizTrg, &ptMask, &psoMask->sizlBitmap); + } + else + { + psoMask = NULL; + ptMask.x = 0; + ptMask.y = 0; + } + + /* Adjust the points */ + ptSrc.x += ptOffset.x; + ptSrc.y += ptOffset.y; + ptMask.x += ptOffset.x; + ptMask.y += ptOffset.y; + + /* Recalculate the target rect */ + rcClipped.left = prclTrg->left + ptOffset.x; + rcClipped.top = prclTrg->top + ptOffset.y; + rcClipped.right = rcClipped.left + sizTrg.cx; + rcClipped.bottom = rcClipped.top + sizTrg.cy; + + /* Is the target surface device managed? */ + if (SURFOBJ_flags(psoTrg) & HOOK_BITBLT) + { + /* Is the source a different device managed surface? */ + if (psoSrc && (psoSrc->hdev != psoTrg->hdev) && + (SURFOBJ_flags(psoSrc) & HOOK_BITBLT)) + { + ERR("Need to copy to standard bitmap format!\n"); + ASSERT(FALSE); + } + + pfnBitBlt = GDIDEVFUNCS(psoTrg).BitBlt; + } + /* Otherwise is the source surface device managed? */ + else if (psoSrc && (SURFOBJ_flags(psoSrc) & HOOK_BITBLT)) + { + pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; + } + else + { + pfnBitBlt = EngBitBlt; + } + + bResult = pfnBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + &rcClipped, + psoSrc ? &ptSrc : NULL, + psoMask ? &ptMask : NULL, + pbo, + pptlBrush, + rop4); + + // FIXME: cleanup temp surface! + + return bResult; +} + +BOOL +APIENTRY +NtGdiEngBitBlt( + IN SURFOBJ *psoTrgUMPD, + IN SURFOBJ *psoSrcUMPD, + IN SURFOBJ *psoMaskUMPD, + IN CLIPOBJ *pcoUMPD, + IN XLATEOBJ *pxloUMPD, + IN RECTL *prclTrg, + IN POINTL *pptlSrc, + IN POINTL *pptlMask, + IN BRUSHOBJ *pboUMPD, + IN POINTL *pptlBrush, + IN ROP4 rop4) +{ + RECTL rclTrg; + POINTL ptlSrc, ptlMask, ptlBrush; + HSURF hsurfTrg, hsurfSrc = NULL, hsurfMask = NULL; + HANDLE hBrushObj; // HUMPDOBJ + SURFOBJ *psoTrg, *psoSrc, *psoMask; + CLIPOBJ *pco; + XLATEOBJ *pxlo; + BRUSHOBJ *pbo; + BOOL bResult; + + _SEH2_TRY + { + ProbeForRead(prclTrg, sizeof(RECTL), 1); + rclTrg = *prclTrg; + + ProbeForRead(psoTrgUMPD, sizeof(SURFOBJ), 1); + hsurfTrg = psoTrgUMPD->hsurf; + + if (ROP4_USES_SOURCE(rop4)) + { + ProbeForRead(pptlSrc, sizeof(POINTL), 1); + ptlSrc = *pptlSrc; + + ProbeForRead(psoSrcUMPD, sizeof(SURFOBJ), 1); + hsurfSrc = psoSrcUMPD->hsurf; + } + + if (ROP4_USES_MASK(rop4)) + { + ProbeForRead(pptlMask, sizeof(POINTL), 1); + ptlMask = *pptlMask; + + ProbeForRead(psoMaskUMPD, sizeof(SURFOBJ), 1); + hsurfMask = psoMaskUMPD->hsurf; + } + + if (ROP4_USES_PATTERN(rop4)) + { + ProbeForRead(pptlBrush, sizeof(POINTL), 1); + ptlBrush = *pptlBrush; + + ProbeForRead(psoSrcUMPD, sizeof(SURFOBJ), 1); + hBrushObj = pboUMPD->pvRbrush; // FIXME + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + // FIXME: these need to be converted/locked! + psoTrg = NULL; + psoSrc = NULL; + psoMask = NULL; + pco = NULL; + pxlo = NULL; + pbo = NULL; + + bResult = EngBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + &rclTrg, + pptlSrc ? &ptlSrc : NULL, + pptlMask ? &ptlMask : NULL, + pbo, + pptlBrush ? &ptlBrush : NULL, + rop4); + + return bResult; +} + +BOOL +NTAPI +IntEngMaskBlt( + SURFOBJ *psoDest, + SURFOBJ *psoMask, + CLIPOBJ *pco, + XLATEOBJ *pxloDest, + XLATEOBJ *pxloSource, + RECTL *DestRect, + POINTL *pptlMask, + BRUSHOBJ *pbo, + POINTL *pptlBrushOrigin) +{ + ASSERT(FALSE); + return 0; +} + Propchange: trunk/reactos/subsystems/win32/win32k/eng/bitblt_new.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 7 months

[tkreuzer] 56212: [DIBLIB] - Implement spacial even more optimized versions of SRCCOPY on equal surfaces for 8, 16, 24 and 32bpp. - Add the right-to-left versions to the function tables - Add _CALCSH...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 22 20:12:50 2012 New Revision: 56212 URL: http://svn.reactos.org/svn/reactos?rev=56212&view=rev Log: [DIBLIB] - Implement spacial even more optimized versions of SRCCOPY on equal surfaces for 8,16,24 and 32bpp. - Add the right-to-left versions to the function tables - Add _CALCSHIFT macro(s) to calculate the shift in the dib functions, instead of precalculating it in EngBitBlt. This costs us a few bytes per function (yes, with so many functions, every byte counts!) but since it's only for 1 and 4 bpp and improves the code by keeping DIB specific code out of the Eng function, it's reasonable to do so. - Add optional optimization pragmas Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h Modified: trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -1,5 +1,55 @@ #include "DibLib.h" + +VOID +FASTCALL +Dib_BitBlt_SRCCOPY_EqSurf(PBLTDATA pBltData) +{ + ULONG cLines, cjWidth = pBltData->ulWidth * pBltData->jDstBpp; + PBYTE pjDestBase = pBltData->siDst.pjBase; + PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Loop all lines */ + cLines = pBltData->ulHeight; + while (cLines--) + { + memcpy(pjDestBase, pjSrcBase, cjWidth); + pjDestBase += pBltData->siDst.lDelta; + pjSrcBase += pBltData->siSrc.lDelta; + } +} + +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf Dib_BitBlt_SRCCOPY_EqSurf + +/* special movsd optimization on x86 */ +#if defined(_M_IX86) || defined(_M_AMD64) +VOID +FASTCALL +Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData) +{ + ULONG cLines, cRows = pBltData->ulWidth; + PBYTE pjDestBase = pBltData->siDst.pjBase; + PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Loop all lines */ + cLines = pBltData->ulHeight; + while (cLines--) + { + __movsd((PULONG)pjDestBase, (PULONG)pjSrcBase, cRows); + pjDestBase += pBltData->siDst.lDelta; + pjSrcBase += pBltData->siSrc.lDelta; + } +} +#else +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf +#endif + +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 #define __USES_SOURCE 1 #define __USES_PATTERN 0 Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib.c [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -1,5 +1,7 @@ #include "DibLib.h" + +BYTE ajShift4[2] = {4, 0}; enum { Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib.h [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -9,6 +9,21 @@ #include <windef.h> #include <wingdi.h> #include <winddi.h> + +#ifdef _OPTIMIZE_DIBLIB +#ifdef _MSC_VER +#pragma optimize("g", on) +#else +#pragma GCC optimize("O3") +#endif +#endif + +typedef +ULONG +(NTAPI *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); + +extern BYTE ajShift4[2]; + #include "DibLib_interface.h" #define _DibXlate(pBltData, ulColor) (pBltData->pfnXlate(pBltData->pxlo, ulColor)) @@ -16,51 +31,54 @@ #define __PASTE_(s1,s2) s1##s2 #define __PASTE(s1,s2) __PASTE_(s1,s2) -#define __DIB_FUNCTION_NAME_SRCDSTEQ2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp ## _EqSurf -#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDSTEQ2(name, src_bpp, dst_bpp) - -#define __DIB_FUNCTION_NAME_SRCDSTEQR2L2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp ## _EqSurfR2L -#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDSTEQR2L2(name, src_bpp, dst_bpp) - #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp) +#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurf +#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfL2R +#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfR2L #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1) #define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(1<<(jShift))) | ((ulColor)<<(jShift)))) #define _NextPixel_1(ppj, pjShift) (void)((*(pjShift))--, *(pjShift) &= 7, (*(ppj) += (*(pjShift) >> 5))) #define _NextPixelR2L_1(ppj, pjShift) (void)((*(ppj) -= (*(pjShift) >> 5)), (*(pjShift))++, *(pjShift) &= 7) #define _SHIFT_1(x) x +#define _CALCSHIFT_1(pShift, x) (void)(*(pShift) = (7 - ((x) & 7))) #define _ReadPixel_4(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 15) #define _WritePixel_4(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(15<<(jShift))) | ((ulColor)<<(jShift)))) #define _NextPixel_4(ppj, pjShift) (void)((*(ppj) += (*(pjShift) & 1)), (*(pjShift)) -= 4, *(pjShift) &= 7) #define _NextPixelR2L_4(ppj, pjShift) (void)((*(pjShift)) -= 4, *(pjShift) &= 7, (*(ppj) -= (*(pjShift) & 1))) #define _SHIFT_4(x) x +#define _CALCSHIFT_4(pShift, x) (void)(*(pShift) = ajShift4[(x) & 1]) #define _ReadPixel_8(pjSource, x) (*(UCHAR*)(pjSource)) #define _WritePixel_8(pjDest, x, ulColor) (void)(*(UCHAR*)(pjDest) = (UCHAR)(ulColor)) #define _NextPixel_8(ppj, pjShift) (void)(*(ppj) += 1) #define _NextPixelR2L_8(ppj, pjShift) (void)(*(ppj) -= 1) #define _SHIFT_8(x) +#define _CALCSHIFT_8(pShift, x) #define _ReadPixel_16(pjSource, x) (*(USHORT*)(pjSource)) #define _WritePixel_16(pjDest, x, ulColor) (void)(*(USHORT*)(pjDest) = (USHORT)(ulColor)) #define _NextPixel_16(ppj, pjShift) (void)(*(ppj) -= 2) #define _NextPixelR2L_16(ppj, pjShift) (void)(*(ppj) += 2) #define _SHIFT_16(x) +#define _CALCSHIFT_16(pShift, x) #define _ReadPixel_24(pjSource, x) ((pjSource)[0] | ((pjSource)[1] << 8) | ((pjSource)[2] << 16)) #define _WritePixel_24(pjDest, x, ulColor) (void)(((pjDest)[0] = ((ulColor)&0xFF)),((pjDest)[1] = (((ulColor)>>8)&0xFF)),((pjDest)[2] = (((ulColor)>>16)&0xFF))) #define _NextPixel_24(ppj, pjShift) (void)(*(ppj) -= 3) #define _NextPixelR2L_24(ppj, pjShift) (void)(*(ppj) += 3) #define _SHIFT_24(x) +#define _CALCSHIFT_24(pShift, x) #define _ReadPixel_32(pjSource, x) (*(ULONG*)(pjSource)) #define _WritePixel_32(pjDest, x, ulColor) (void)(*(ULONG*)(pjDest) = (ulColor)) #define _NextPixel_32(ppj, pjShift) (void)(*(ppj) += 4) #define _NextPixelR2L_32(ppj, pjShift) (void)(*(ppj) -= 4) #define _SHIFT_32(x) +#define _CALCSHIFT_32(pShift, x) Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -44,7 +44,15 @@ PFN_DIBFUNCTION __PASTE(gapfn, __FUNCTIONNAME)[7][7] = { - {0, 0, 0, 0, 0, 0}, + { + 0, + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 1, 1), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 4, 4), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 8, 8), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 16, 16), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 24, 24), + __DIB_FUNCTION_NAME_SRCDSTEQR2L(__FUNCTIONNAME, 32, 32), + }, { __DIB_FUNCTION_NAME_SRCDSTEQ(__FUNCTIONNAME, 1, 1), __DIB_FUNCTION_NAME_SRCDST(__FUNCTIONNAME, 1, 1), Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -9,6 +9,9 @@ #define _WritePixel(pj, jShift, c) __PASTE(_WritePixel_, _DEST_BPP)(pj, jShift, c) #define _NextPixel(bpp, ppj, pjShift) __PASTE(_NextPixel_, bpp)(ppj, pjShift) #define _SHIFT(bpp, x) __PASTE(_SHIFT_, bpp)(x) +#define _CALCSHIFT(bpp, pshift, x) __PASTE(_CALCSHIFT_, bpp)(pshift, x) + +#if (__PASTE(_DibFunction, _manual) != 1) VOID FASTCALL @@ -42,7 +45,7 @@ pjPatBase = pBltData->siPat.pjBase; pjPatBase += pBltData->siPat.ptOrig.y * pBltData->siPat.lDelta; pjPattern = pjPatBase + pBltData->siPat.ptOrig.x * _DEST_BPP / 8; - _SHIFT(_DEST_BPP, jPatShift = pBltData->siPat.jShift0;) + _CALCSHIFT(_DEST_BPP, &jPatShift, pBltData->siPat.ptOrig.x); cPatLines = pBltData->ulPatHeight - pBltData->siPat.ptOrig.y; cPatRows = pBltData->ulPatWidth - pBltData->siPat.ptOrig.x; #endif @@ -57,14 +60,14 @@ { /* Set current bit pointers and shifts */ pjDest = pjDestBase; - _SHIFT(_DEST_BPP, jDstShift = pBltData->siDst.jShift0;) + _CALCSHIFT(_DEST_BPP, &jDstShift, pBltData->siDst.ptOrig.x); #if __USES_SOURCE pjSource = pjSrcBase; - _SHIFT(_SOURCE_BPP, jSrcShift = pBltData->siSrc.jShift0;) + _CALCSHIFT(_SOURCE_BPP, &jSrcShift, pBltData->siSrc.ptOrig.x); #endif #if __USES_MASK pjMask = pjMaskBase; - jMskShift = pBltData->siMsk.jShift0; + _CALCSHIFT_1(&jMskShift, pBltData->siMsk.ptOrig.x); #endif /* Loop all rows */ @@ -126,5 +129,7 @@ } } +#endif // manual + #undef _DibFunction #undef __FUNCTIONNAME2 Modified: trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h [iso-8859-1] Thu Mar 22 20:12:50 2012 @@ -1,17 +1,14 @@ #include "RopFunctions.h" - -typedef -ULONG -(NTAPI *PFN_XLATE)(XLATEOBJ* pxlo, ULONG ulColor); typedef struct { ULONG iFormat; + PBYTE pvScan0; PBYTE pjBase; LONG lDelta; POINTL ptOrig; - BYTE jShift0; + BYTE jBpp; } SURFINFO; typedef struct @@ -30,6 +27,7 @@ ULONG rop4; PFN_DOROP apfnDoRop[2]; ULONG ulSolidColor; + BYTE jDstBpp; } BLTDATA, *PBLTDATA; typedef

12 years, 7 months

[tkreuzer] 56211: [WIN32K] - Add EngAcquireSemaphoreShared prototype - implement RECTL_bIsWellOrdered - implement DbgLookupDHPDEV - start implementation of driver callback debug hooks

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 21 20:50:04 2012 New Revision: 56211 URL: http://svn.reactos.org/svn/reactos?rev=56211&view=rev Log: [WIN32K] - Add EngAcquireSemaphoreShared prototype - implement RECTL_bIsWellOrdered - implement DbgLookupDHPDEV - start implementation of driver callback debug hooks Added: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/subsystems/win32/win32k/include/rect.h Added: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c (added) +++ trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -1,0 +1,1264 @@ +/* + * PROJECT: Win32 subsystem + * LICENSE: GNU GPL, see COPYING in the top level directory + * FILE: subsystems/win32/win32k/eng/ddidbg.c + * PURPOSE: Debug hooks for display driver callbacks + * PROGRAMMERS: Timo Kreuzer + */ + +#include <win32k.h> +DBG_DEFAULT_CHANNEL(EngDev); + +PPDEVOBJ +NTAPI +DbgLookupDHPDEV(DHPDEV dhpdev); + +VOID +DbgDrvReserved(void) +{ + ASSERT(FALSE); +} + +DHPDEV +APIENTRY +DbgDrvEnablePDEV( + _In_ DEVMODEW *pdm, + _In_ LPWSTR pwszLogAddress, + ULONG cPat, + _In_opt_ HSURF *phsurfPatterns, + ULONG cjCaps, + _Out_ ULONG *pdevcaps, + ULONG cjDevInfo, + _Out_ DEVINFO *pdi, + HDEV hdev, + _In_ LPWSTR pwszDeviceName, + HANDLE hDriver) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + + ASSERT(pdm); + ASSERT(hdev); + + return ppdev->pldev->pfn.EnablePDEV(pdm, + pwszLogAddress, + cPat, + phsurfPatterns, + cjCaps, + pdevcaps, + cjDevInfo, + pdi, + hdev, + pwszDeviceName, + hDriver); +} + +VOID +APIENTRY +DbgDrvCompletePDEV( + DHPDEV dhpdev, + HDEV hdev) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + + ASSERT(ppdev); + + ppdev->pldev->pfn.CompletePDEV(dhpdev, hdev); +} + +VOID +APIENTRY +DbgDrvDisablePDEV( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisablePDEV(dhpdev); +} + +HSURF +APIENTRY +DbgDrvEnableSurface( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.EnableSurface(dhpdev); +} + +VOID +APIENTRY +DbgDrvDisableSurface( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisableSurface(dhpdev); +} + +BOOL +APIENTRY +DbgDrvAssertMode( + _In_ DHPDEV dhpdev, + _In_ BOOL bEnable) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.AssertMode(dhpdev, bEnable); +} + +BOOL +APIENTRY +DbgDrvOffset( + SURFOBJ* pso, + LONG x1, + LONG x2, + FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + + ASSERT(FALSE); + return 0; +} + +ULONG +APIENTRY +DbgDrvResetPDEV( + DHPDEV dhpdev, + PVOID Reserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.ResetDevice(dhpdev, Reserved); +} + +VOID +APIENTRY +DbgDrvDisableDriver(void) +{ + ASSERT(FALSE); +} + +HBITMAP +APIENTRY +DbgDrvCreateDeviceBitmap( + DHPDEV dhpdev, + SIZEL sizl, + ULONG iFormat) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.CreateDeviceBitmap(dhpdev, sizl, iFormat); +} + +VOID +APIENTRY +DbgDrvDeleteDeviceBitmap( + DHSURF dhsurf) +{ + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvRealizeBrush( + _In_ BRUSHOBJ *pbo, + _Inout_ SURFOBJ *psoTarget, + _In_ SURFOBJ *psoPattern, + _In_opt_ SURFOBJ *psoMask, + _In_ XLATEOBJ *pxlo, + _In_ ULONG iHatch) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTarget->hdev; + ASSERT(FALSE); + return 0; +} + +ULONG +APIENTRY +DbgDrvDitherColor( + _In_ DHPDEV dhpdev, + _In_ ULONG iMode, + _In_ ULONG rgb, + _Inout_ ULONG *pul) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.DitherColor(dhpdev, iMode, rgb, pul); +} + +BOOL +APIENTRY +DbgDrvStrokePath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ LINEATTRS *plineattrs, + _In_ MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvFillPath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mix, + _In_ FLONG flOptions) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvStrokeAndFillPath( + _Inout_ SURFOBJ *pso, + _Inout_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pboStroke, + _In_ LINEATTRS *plineattrs, + _In_ BRUSHOBJ *pboFill, + _In_ POINTL *pptlBrushOrg, + _In_ MIX mixFill, + _In_ FLONG flOptions) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(FALSE); + return 0; +} + +BOOL +APIENTRY +DbgDrvPaint( + IN SURFOBJ *pso, + IN CLIPOBJ *pco, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrushOrg, + IN MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + PPDEVOBJ ppdev; + + /* Get the right BitBlt function */ + if (psurfTrg->flags & HOOK_BITBLT) + { + ppdev = (PPDEVOBJ)psoTrg->hdev; + } + else + { + ASSERT(ROP4_USES_SOURCE(rop4)); + ASSERT(psurfSrc->flags & HOOK_BITBLT); + ppdev = (PPDEVOBJ)psoSrc->hdev; + } + + /* Sanity checks */ + ASSERT(IS_VALID_ROP4(rop4)); + ASSERT(psoTrg); + ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + ASSERT(prclTrg); + ASSERT(prclTrg->left >= 0); + ASSERT(prclTrg->top >= 0); + ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); + ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + ASSERT(RECTL_bIsWellOrdered(prclTrg)); + + if (ROP4_USES_SOURCE(rop4)) + { + ASSERT(psoSrc); + ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); + ASSERT(psoSrc->iBitmapFormat <= BMF_8RLE); + ASSERT(pptlSrc); + ASSERT(pptlSrc->x >= 0); + ASSERT(pptlSrc->y >= 0); + ASSERT(pptlSrc->x <= psoTrg->sizlBitmap.cx); + ASSERT(pptlSrc->y <= psoTrg->sizlBitmap.cy); + } + + if (ROP4_USES_MASK(rop4)) + { + ASSERT(psoMask); + ASSERT(psoMask->iBitmapFormat == BMF_1BPP); + ASSERT(pptlMask); + ASSERT(pptlMask->x >= 0); + ASSERT(pptlMask->y >= 0); + ASSERT(pptlMask->x <= psoMask->sizlBitmap.cx); + ASSERT(pptlMask->y <= psoMask->sizlBitmap.cy); + + } + + if (ROP4_USES_PATTERN(rop4)) + { + ASSERT(pbo); + ASSERT(pptlBrush); + } + + + return ppdev->pldev->pfn.BitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + prclTrg, + pptlSrc, + pptlMask, + pbo, + pptlBrush, + rop4); +} + +BOOL +APIENTRY +DbgDrvCopyBits( + SURFOBJ *psoTrg, + SURFOBJ *psoSrc, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclTrg, + POINTL *pptlSrc) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + PPDEVOBJ ppdev; + + /* Get the right BitBlt function */ + if (psurfTrg->flags & HOOK_COPYBITS) + { + ppdev = (PPDEVOBJ)psoTrg->hdev; + } + else + { + ASSERT(psurfSrc->flags & HOOK_COPYBITS); + ppdev = (PPDEVOBJ)psoSrc->hdev; + } + + return ppdev->pldev->pfn.CopyBits(psoTrg, + psoSrc, + pco, + pxlo, + prclTrg, + pptlSrc); + +} + +BOOL +APIENTRY +DbgDrvStretchBlt( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_opt_ POINTL *pptlMask, + _In_ ULONG iMode) +{ + PSURFACE psurfTrg = CONTAINING_RECORD(psoTrg, SURFACE, SurfObj); + PSURFACE psurfSrc = CONTAINING_RECORD(psoSrc, SURFACE, SurfObj); + + return 0; +} + +BOOL +APIENTRY +DbgDrvSetPalette( + DHPDEV dhpdev, + PALOBJ *ppalo, + FLONG fl, + ULONG iStart, + ULONG cColors) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.SetPalette(dhpdev, ppalo, fl, iStart, cColors); +} + +BOOL +APIENTRY +DbgDrvTextOut( + SURFOBJ *pso, + STROBJ *pstro, + FONTOBJ *pfo, + CLIPOBJ *pco, + RECTL *prclExtra , + RECTL *prclOpaque, + BRUSHOBJ *pboFore, + BRUSHOBJ *pboOpaque, + POINTL *pptlOrg, + MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvEscape( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ ULONG cjIn, + _In_ PVOID pvIn, + _In_ ULONG cjOut, + _Out_ PVOID pvOut) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvDrawEscape( + _In_ SURFOBJ *pso, + _In_ ULONG iEsc, + _In_ CLIPOBJ *pco, + _In_ RECTL *prcl, + _In_ ULONG cjIn, + _In_ PVOID pvIn) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +PIFIMETRICS +APIENTRY +DbgDrvQueryFont( + DHPDEV dhpdev, + ULONG_PTR iFile, + ULONG iFace, + ULONG_PTR *pid) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryFont(dhpdev, iFile, iFace, pid); +} + +PVOID +APIENTRY +DbgDrvQueryFontTree( + DHPDEV dhpdev, + ULONG_PTR iFile, + ULONG iFace, + ULONG iMode, + ULONG_PTR *pid) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryFontData( + DHPDEV dhpdev, + FONTOBJ *pfo, + ULONG iMode, + HGLYPH hg, + GLYPHDATA *pgd, + _Out_ PVOID pv, + ULONG cjSize) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryFontData(dhpdev, pfo, iMode, hg, pgd, pv, cjSize); +} + +ULONG +APIENTRY +DbgDrvSetPointerShape( + _In_ SURFOBJ *pso, + _In_ SURFOBJ *psoMask, + _In_ SURFOBJ *psoColor, + _In_ XLATEOBJ *pxlo, + _In_ LONG xHot, + _In_ LONG yHot, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl, + _In_ FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +VOID +APIENTRY +DbgDrvMovePointer( + _In_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ RECTL *prcl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; +} + +BOOL +APIENTRY +DbgDrvLineTo( + SURFOBJ *pso, + CLIPOBJ *pco, + BRUSHOBJ *pbo, + LONG x1, + LONG y1, + LONG x2, + LONG y2, + RECTL *prclBounds, + MIX mix) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvSendPage( + _In_ SURFOBJ *pso) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartPage( + _In_ SURFOBJ *pso) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvEndDoc( + _In_ SURFOBJ *pso, + _In_ FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartDoc( + _In_ SURFOBJ *pso, + _In_ LPWSTR pwszDocName, + _In_ DWORD dwJobId) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvGetGlyphMode( + _In_ DHPDEV dhpdev, + _In_ FONTOBJ *pfo) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.GetGlyphMode(dhpdev, pfo); +} + +VOID +APIENTRY +DbgDrvSynchronize( + DHPDEV dhpdev, + RECTL *prcl) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.Synchronize(dhpdev, prcl); +} + +ULONG_PTR +APIENTRY +DbgDrvSaveScreenBits( + SURFOBJ *pso, + ULONG iMode, + ULONG_PTR ident, + RECTL *prcl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvGetModes( + _In_ HANDLE hDriver, + ULONG cjSize, + _Out_opt_ DEVMODEW *pdm) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvFree( + PVOID pv, + ULONG_PTR id) +{ +} + +VOID +APIENTRY +DbgDrvDestroyFont( + FONTOBJ *pfo) +{ +} + +LONG +APIENTRY +DbgDrvQueryFontCaps( + ULONG culCaps, + ULONG *pulCaps) +{ + return 0; +} + +ULONG_PTR +APIENTRY +DbgDrvLoadFontFile( + ULONG cFiles, + ULONG_PTR *piFile, + PVOID *ppvView, + ULONG *pcjView, + DESIGNVECTOR *pdv, + ULONG ulLangID, + ULONG ulFastCheckSum) +{ + return 0; +} + +BOOL +APIENTRY +DbgDrvUnloadFontFile( + ULONG_PTR iFile) +{ + return 0; +} + +ULONG +APIENTRY +DbgDrvFontManagement( + _In_ SURFOBJ *pso, + _In_opt_ FONTOBJ *pfo, + _In_ ULONG iMode, + _In_ ULONG cjIn, + _In_ PVOID pvIn, + _In_ ULONG cjOut, + _Out_ PVOID pvOut) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryTrueTypeTable( + ULONG_PTR iFile, + ULONG ulFont, + ULONG ulTag, + PTRDIFF dpStart, + ULONG cjBuf, + BYTE *pjBuf, + PBYTE *ppjTable, + ULONG *pcjTable) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryTrueTypeOutline( + DHPDEV dhpdev, + FONTOBJ *pfo, + HGLYPH hglyph, + BOOL bMetricsOnly, + GLYPHDATA *pgldt, + ULONG cjBuf, + TTPOLYGONHEADER *ppoly) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + return 0; +} + +PVOID +APIENTRY +DbgDrvGetTrueTypeFile( + ULONG_PTR iFile, + ULONG *pcj) +{ + return 0; +} + +LONG +APIENTRY +DbgDrvQueryFontFile( + ULONG_PTR iFile, + ULONG ulMode, + ULONG cjBuf, + ULONG *pulBuf) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvMovePanning( + LONG x, + LONG y, + FLONG fl) +{ + ERR("Obsolete driver function %s called!\n", __FUNCTION__); + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvQueryAdvanceWidths( + DHPDEV dhpdev, + FONTOBJ *pfo, + ULONG iMode, + _In_ HGLYPH *phg, + _Out_ PVOID pvWidths, + ULONG cGlyphs) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + return 0; +} + +BOOL +APIENTRY +DbgDrvSetPixelFormat( + SURFOBJ *pso, + LONG iPixelFormat, + HWND hwnd) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +LONG +APIENTRY +DbgDrvDescribePixelFormat( + DHPDEV dhpdev, + LONG iPixelFormat, + ULONG cjpfd, + PIXELFORMATDESCRIPTOR *ppfd) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.DescribePixelFormat(dhpdev, iPixelFormat, cjpfd, ppfd); +} + +BOOL +APIENTRY +DbgDrvSwapBuffers( + SURFOBJ *pso, + WNDOBJ *pwo) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStartBanding( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvNextBand( + _In_ SURFOBJ *pso, + _In_ POINTL *pptl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvGetDirectDrawInfo( + DHPDEV dhpdev, + DD_HALINFO *pHalInfo, + DWORD *pdwNumHeaps, + VIDEOMEMORY *pvmList, + DWORD *pdwNumFourCCCodes, + DWORD *pdwFourCC) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.GetDirectDrawInfo(dhpdev, + pHalInfo, + pdwNumHeaps, + pvmList, + pdwNumFourCCCodes, + pdwFourCC); +} + +BOOL +APIENTRY +DbgDrvEnableDirectDraw( + DHPDEV dhpdev, + DD_CALLBACKS *pCallBacks, + DD_SURFACECALLBACKS *pSurfaceCallBacks, + DD_PALETTECALLBACKS *pPaletteCallBacks) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.EnableDirectDraw(dhpdev, + pCallBacks, + pSurfaceCallBacks, + pPaletteCallBacks); +} + +VOID +APIENTRY +DbgDrvDisableDirectDraw( + DHPDEV dhpdev) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + ppdev->pldev->pfn.DisableDirectDraw(dhpdev); +} + +BOOL +APIENTRY +DbgDrvQuerySpoolType(DHPDEV PDev, LPWSTR SpoolType) +{ + ERR("Obsolete driver function %s called!\n", __FUNCTION__); + ASSERT(FALSE); + return 0; +} + +HANDLE +APIENTRY +DbgDrvIcmCreateColorTransform( + _In_ DHPDEV dhpdev, + _In_ LPLOGCOLORSPACEW pLogColorSpace, + _In_opt_ PVOID pvSourceProfile, + _In_ ULONG cjSourceProfile, + _In_ PVOID pvDestProfile, + _In_ ULONG cjDestProfile, + _In_opt_ PVOID pvTargetProfile, + _In_ ULONG cjTargetProfile, + _In_ DWORD dwReserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmCreateColorTransform(dhpdev, + pLogColorSpace, + pvSourceProfile, + cjSourceProfile, + pvDestProfile, + cjDestProfile, + pvTargetProfile, + cjTargetProfile, + dwReserved); +} + +BOOL +APIENTRY +DbgDrvIcmDeleteColorTransform( + _In_ DHPDEV dhpdev, + _In_ HANDLE hcmXform) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmDeleteColorTransform(dhpdev, hcmXform); +} + +BOOL +APIENTRY +DbgDrvIcmCheckBitmapBits( + DHPDEV dhpdev, + HANDLE hColorTransform, + SURFOBJ *pso, + PBYTE paResults) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmCheckBitmapBits(dhpdev, + hColorTransform, + pso, + paResults); +} + +BOOL +APIENTRY +DbgDrvIcmSetDeviceGammaRamp( + DHPDEV dhpdev, + ULONG iFormat, + LPVOID lpRamp) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + + ASSERT(ppdev); + + return ppdev->pldev->pfn.IcmSetDeviceGammaRamp(dhpdev, iFormat, lpRamp); +} + +BOOL +APIENTRY +DbgDrvGradientFill( + _Inout_ SURFOBJ *psoTrg, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ TRIVERTEX *pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ RECTL *prclExtents, + _In_ POINTL *pptlDitherOrg, + _In_ ULONG ulMode) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvStretchBltROP( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_ POINTL *pptlHTOrg, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_opt_ POINTL *pptlMask, + _In_ ULONG iMode, + _In_ BRUSHOBJ *pbo, + _In_ DWORD rop4) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvPlgBlt( + _Inout_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMsk, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_opt_ COLORADJUSTMENT *pca, + _In_opt_ POINTL *pptlBrushOrg, + _In_ POINTFIX *pptfx, + _In_ RECTL *prcl, + _In_opt_ POINTL *pptl, + _In_ ULONG iMode) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvAlphaBlend( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDest, + _In_ RECTL *prclSrc, + _In_ BLENDOBJ *pBlendObj) +{ + return 0; +} + +VOID +APIENTRY +DbgSynthesizeFont(void) +{ + ASSERT(FALSE); +} + +VOID +APIENTRY +DbgGetSynthesizedFontFiles(void) +{ + ASSERT(FALSE); +} + +BOOL +APIENTRY +DbgDrvTransparentBlt( + _Inout_ SURFOBJ *psoTrg, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclDst, + _In_ RECTL *prclSrc, + _In_ ULONG iTransColor, + _In_ ULONG ulReserved) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)psoTrg->hdev; + return 0; +} + +ULONG +APIENTRY +DbgDrvQueryPerBandInfo( + _In_ SURFOBJ *pso, + _Inout_ PERBANDINFO *pbi) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + return 0; +} + +BOOL +APIENTRY +DbgDrvQueryDeviceSupport( + SURFOBJ *pso, + XLATEOBJ *pxlo, + XFORMOBJ *pxo, + ULONG iType, + ULONG cjIn, + _In_ PVOID pvIn, + ULONG cjOut, + _Out_ PVOID pvOut) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + return ppdev->pldev->pfn.QueryDeviceSupport(pso, + pxlo, + (PVOID)pxo, // FIXME!!! + iType, + cjIn, + pvIn, + cjOut, + pvOut); +} + +HBITMAP +APIENTRY +DbgDrvDeriveSurface( + DD_DIRECTDRAW_GLOBAL *pDirectDraw, + DD_SURFACE_LOCAL *pSurface) +{ + return 0; +} + +PFD_GLYPHATTR +APIENTRY +DbgDrvQueryGlyphAttrs( + _In_ FONTOBJ *pfo, + _In_ ULONG iMode) +{ + return 0; +} + +VOID +APIENTRY +DbgDrvNotify( + SURFOBJ *pso, + ULONG iType, + PVOID pvData) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + ppdev->pldev->pfn.Notify(pso, iType, pvData); +} + +VOID +APIENTRY +DbgDrvSynchronizeSurface( + SURFOBJ *pso, + RECTL *prcl, + FLONG fl) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)pso->hdev; + ASSERT(ppdev); + + ppdev->pldev->pfn.SynchronizeSurface(pso, prcl, fl); +} + +ULONG +APIENTRY +DbgDrvResetDevice( + DHPDEV dhpdev, + PVOID Reserved) +{ + PPDEVOBJ ppdev = DbgLookupDHPDEV(dhpdev); + ASSERT(ppdev); + + return ppdev->pldev->pfn.ResetDevice(dhpdev, Reserved); +} + +PVOID +apfnDbgDrvFunctions[] = +{ + DbgDrvEnablePDEV, + DbgDrvCompletePDEV, + DbgDrvDisablePDEV, + DbgDrvEnableSurface, + DbgDrvDisableSurface, + DbgDrvAssertMode, + DbgDrvOffset, + DbgDrvResetPDEV, + NULL, //DbgDrvDisableDriver, + DbgDrvReserved, // Unknown1 + DbgDrvCreateDeviceBitmap, + NULL, //DbgDrvDeleteDeviceBitmap, + DbgDrvRealizeBrush, + DbgDrvDitherColor, + DbgDrvStrokePath, + DbgDrvFillPath, + DbgDrvStrokeAndFillPath, + DbgDrvPaint, + DbgDrvBitBlt, + NULL, //DbgDrvCopyBits, + NULL, //DbgDrvStretchBlt, + DbgDrvReserved, + DbgDrvSetPalette, + NULL, //DbgDrvTextOut, + NULL, //DbgDrvEscape, + NULL, //DbgDrvDrawEscape, + DbgDrvQueryFont, + NULL, //DbgDrvQueryFontTree, + DbgDrvQueryFontData, + NULL, //DbgDrvSetPointerShape, + NULL, //DbgDrvMovePointer, + NULL, //DbgDrvLineTo, + NULL, //DbgDrvSendPage, + NULL, //DbgDrvStartPage, + NULL, //DbgDrvEndDoc, + NULL, //DbgDrvStartDoc, + DbgDrvReserved, + DbgDrvGetGlyphMode, + DbgDrvSynchronize, + DbgDrvReserved, + NULL, //DbgDrvSaveScreenBits, + NULL, //DbgDrvGetModes, + NULL, //DbgDrvFree, + NULL, //DbgDrvDestroyFont, + NULL, //DbgDrvQueryFontCaps, + NULL, //DbgDrvLoadFontFile, + NULL, //DbgDrvUnloadFontFile, + NULL, //DbgDrvFontManagement, + NULL, //DbgDrvQueryTrueTypeTable, + NULL, //DbgDrvQueryTrueTypeOutline, + NULL, //DbgDrvGetTrueTypeFile, + NULL, //DbgDrvQueryFontFile, + DbgDrvMovePanning, + NULL, //DbgDrvQueryAdvanceWidths, + NULL, //DbgDrvSetPixelFormat, + DbgDrvDescribePixelFormat, + NULL, //DbgDrvSwapBuffers, + NULL, //DbgDrvStartBanding, + NULL, //DbgDrvNextBand, + DbgDrvGetDirectDrawInfo, + DbgDrvEnableDirectDraw, + DbgDrvDisableDirectDraw, + DbgDrvQuerySpoolType, + DbgDrvReserved, + DbgDrvIcmCreateColorTransform, + DbgDrvIcmDeleteColorTransform, + DbgDrvIcmCheckBitmapBits, + DbgDrvIcmSetDeviceGammaRamp, + NULL, //DbgDrvGradientFill, + NULL, //DbgDrvStretchBltROP, + NULL, //DbgDrvPlgBlt, + NULL, //DbgDrvAlphaBlend, + NULL, //DbgSynthesizeFont, + NULL, //DbgGetSynthesizedFontFiles, + NULL, //DbgDrvTransparentBlt, + NULL, //DbgDrvQueryPerBandInfo, + DbgDrvQueryDeviceSupport, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved, + NULL, //DbgDrvDeriveSurface, + NULL, //DbgDrvQueryGlyphAttrs, + DbgDrvNotify, + DbgDrvSynchronizeSurface, + DbgDrvResetDevice, + DbgDrvReserved, + DbgDrvReserved, + DbgDrvReserved +}; Propchange: trunk/reactos/subsystems/win32/win32k/eng/drvdbg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -25,6 +25,29 @@ return STATUS_SUCCESS; } +#if DBG +PPDEVOBJ +NTAPI +DbgLookupDHPDEV(DHPDEV dhpdev) +{ + PPDEVOBJ ppdev; + + /* Lock PDEV list */ + EngAcquireSemaphoreShared(ghsemPDEV); + + /* Walk through the list of PDEVs */ + for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) + { + /* Compare with the given DHPDEV */ + if (ppdev->dhpdev == dhpdev) break; + } + + /* Unlock PDEV list */ + EngReleaseSemaphore(ghsemPDEV); + + return ppdev; +} +#endif PPDEVOBJ PDEVOBJ_AllocPDEV() @@ -803,7 +826,7 @@ return NULL; /* Lock PDEV list */ - EngAcquireSemaphore(ghsemPDEV); + EngAcquireSemaphoreShared(ghsemPDEV); /* Walk through the list of PDEVs */ for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) Modified: trunk/reactos/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/eng.h [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -1,4 +1,9 @@ #pragma once + +VOID +NTAPI +EngAcquireSemaphoreShared( + IN HSEMAPHORE hsem); BOOL APIENTRY IntEngMaskBlt(SURFOBJ *psoDest, Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] Wed Mar 21 20:50:04 2012 @@ -46,6 +46,14 @@ } BOOL +FORCEINLINE +RECTL_bIsWellOrdered(const RECTL *prcl) +{ + return ((prcl->left <= prcl->right) && + (prcl->top <= prcl->bottom)); +} + +BOOL FASTCALL RECTL_bUnionRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); @@ -57,6 +65,6 @@ FASTCALL RECTL_vMakeWellOrdered(RECTL *prcl); -VOID +VOID FASTCALL RECTL_vInflateRect(RECTL *rect, INT dx, INT dy);

12 years, 7 months

[tfaber] 56210: [USP10] - Apply fixes from Wine 1.4. Fixes invalid free in notepad and other edit control users See issue #6966 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 21 20:39:41 2012 New Revision: 56210 URL: http://svn.reactos.org/svn/reactos?rev=56210&view=rev Log: [USP10] - Apply fixes from Wine 1.4. Fixes invalid free in notepad and other edit control users See issue #6966 for more details. Modified: trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/dll/win32/usp10/usp10_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -438,9 +438,12 @@ int char_count = 0; int k; - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k >= 0) + { + for (; k < cChars && pwLogClust[k] == i; k++) char_count++; + } class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); @@ -868,12 +871,15 @@ script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); psc->script_count = GET_BE_WORD(script->ScriptCount); TRACE("initializing %i scripts in this font\n",psc->script_count); - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); - for (i = 0; i < psc->script_count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].table = ((const BYTE*)script + offset); + if (psc->script_count) + { + psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + for (i = 0; i < psc->script_count; i++) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].table = ((const BYTE*)script + offset); + } } } } @@ -923,15 +929,18 @@ script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); script->default_language.table = (const BYTE*)table + GET_BE_WORD(table->DefaultLangSys); - TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); - - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); - - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].table = ((const BYTE*)table + offset); + if (script->language_count) + { + TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); + + script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + + for (i = 0; i < script->language_count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].table = ((const BYTE*)table + offset); + } } } } @@ -1016,23 +1025,26 @@ language->feature_count = GET_BE_WORD(lang->FeatureCount); TRACE("%i features\n",language->feature_count); - language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); - - feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - for (i = 0; i < language->feature_count; i++) - { - const GSUB_Feature *feature; - int j; - int index = GET_BE_WORD(lang->FeatureIndex[i]); - - language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); - language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); - feature = (const GSUB_Feature*)language->features[i].feature; - language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); - language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); - for (j = 0; j < language->features[i].lookup_count; j++) - language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + if (language->feature_count) + { + language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); + + feature_list = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); + + for (i = 0; i < language->feature_count; i++) + { + const GSUB_Feature *feature; + int j; + int index = GET_BE_WORD(lang->FeatureIndex[i]); + + language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); + language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const GSUB_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); + for (j = 0; j < language->features[i].lookup_count; j++) + language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + } } } } Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -2359,13 +2359,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2425,13 +2423,11 @@ int char_count = 0; BOOL isInit, isFinal; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } isInit = (i == initGlyph || (i+dirR > 0 && i+dirR < cGlyphs && spaces[i+dirR])); @@ -2534,13 +2530,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2581,13 +2575,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2614,13 +2606,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (char_count == 0) @@ -2658,13 +2648,11 @@ int char_index[20]; int char_count = 0; - for (k = 0; k < cChars; k++) - { - if (pwLogClust[k] == i) - { - char_index[char_count] = k; - char_count++; - } + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; } if (override_gsub) Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -25,6 +25,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -703,6 +704,11 @@ int* logical2visual; } StringAnalysis; +typedef struct { + BOOL ascending; + WORD target; +} FindGlyph_struct; + static inline void *heap_alloc(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); @@ -879,6 +885,46 @@ } while (1); return SCRIPT_UNDEFINED; +} + +static int compare_FindGlyph(const void *a, const void* b) +{ + const FindGlyph_struct *find = (FindGlyph_struct*)a; + const WORD *idx= (WORD*)b; + int rc = 0; + + if ( find->target > *idx) + rc = 1; + else if (find->target < *idx) + rc = -1; + + if (!find->ascending) + rc *= -1; + return rc; +} + +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) +{ + FindGlyph_struct fgs; + WORD *ptr; + INT k; + + if (pwLogClust[0] < pwLogClust[cChars-1]) + fgs.ascending = TRUE; + else + fgs.ascending = FALSE; + + fgs.target = target; + ptr = bsearch(&fgs, pwLogClust, cChars, sizeof(WORD), compare_FindGlyph); + + if (!ptr) + return -1; + + for (k = (ptr - pwLogClust)-1; k >= 0 && pwLogClust[k] == target; k--) + ; + k++; + + return k; } /*********************************************************************** @@ -1726,19 +1772,12 @@ hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - while (hr == E_OUTOFMEMORY) - { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = heap_realloc_zero(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - } - if (hr != S_OK) goto error; + if FAILED(hr) + { + if (hr == E_OUTOFMEMORY) + hr = E_INVALIDARG; + goto error; + } /* set back to out of memory for default goto error behaviour */ hr = E_OUTOFMEMORY; @@ -1817,6 +1856,13 @@ } } + /* FIXME: When we properly shape Hangul remove this check */ + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); @@ -1873,13 +1919,9 @@ static inline BOOL does_glyph_start_cluster(const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cChars, int glyph, int direction) { - int i; - if (pva[glyph].fClusterStart) return TRUE; - for (i = 0; i < cChars; i++) - if (pwLogClust[i] == glyph) break; - if (i != cChars) + if (USP10_FindGlyphInLogClust(pwLogClust, cChars, glyph) >= 0) return TRUE; return FALSE; @@ -2309,16 +2351,14 @@ static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cGlyphs, int cChars, int glyph, int direction) { int advance; - int log_clust_max = 0; - int i; + int log_clust_max; advance = piAdvance[glyph]; - for (i = 0; i < cChars; i++) - { - if (pwLogClust[i] > log_clust_max) - log_clust_max = pwLogClust[i]; - } + if (pwLogClust[0] > pwLogClust[cChars-1]) + log_clust_max = pwLogClust[0]; + else + log_clust_max = pwLogClust[cChars-1]; if (glyph > log_clust_max) return advance; Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -204,6 +204,8 @@ #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0 +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; + BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN; BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, Modified: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -2,9 +2,9 @@ =================================================================== --- usp10.c (revision 54504) +++ usp10.c (working copy) -@@ -1989,3 +3159,9 @@ - for (i = 0; i < num_glyphs; i++) justify[i] = advance[i]; - return S_OK; +@@ -3621,3 +3621,9 @@ + + return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); } + +BOOL gbLpkPresent = FALSE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 21 20:39:41 2012 @@ -168,7 +168,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.3.37 reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Synced to Wine-1.3.37 +reactos/dll/win32/usp10 # Synced to Wine-1.4 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

12 years, 7 months

[tfaber] 56209: [USER32/EDIT] - Remove whitespace differences and mark ReactOS changes to make Wine-syncing easier

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 21 18:33:01 2012 New Revision: 56209 URL: http://svn.reactos.org/svn/reactos?rev=56209&view=rev Log: [USER32/EDIT] - Remove whitespace differences and mark ReactOS changes to make Wine-syncing easier Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Wed Mar 21 18:33:01 2012 @@ -85,7 +85,7 @@ LINE_END ending; INT width; /* width of the line in pixels */ INT index; /* line index into the buffer */ - SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data */ + SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data */ struct tagLINEDEF *next; } LINEDEF; @@ -142,11 +142,11 @@ */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ - /* - * Uniscribe Data - */ - SCRIPT_LOGATTR *logAttr; - SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data for single line controls */ + /* + * Uniscribe Data + */ + SCRIPT_LOGATTR *logAttr; + SCRIPT_STRING_ANALYSIS ssa; /* Uniscribe Data for single line controls */ } EDITSTATE; @@ -235,7 +235,7 @@ msg = WM_CTLCOLOREDIT; /* why do we notify to es->hwndParent, and we send this one to GetParent()? */ - hbrush = GetControlBrush(es->hwndSelf, hdc, msg); + hbrush = GetControlBrush(es->hwndSelf, hdc, msg); // reactos r54259 return hbrush; } @@ -257,7 +257,7 @@ * allows to be called without linebreaks between s[0] up to * s[count - 1]. Remember it is only called * internally, so we can decide this for ourselves. - * Additional we will always be breaking the full string. + * Additional we will always be breaking the full string. * */ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT action) @@ -340,7 +340,7 @@ countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); - if (textA == NULL) return 0; + if (textA == NULL) return 0; // reactos r33503 WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); @@ -522,7 +522,7 @@ insert it into the link list */ LINEDEF *new_line = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINEDEF)); if (new_line == NULL) // reactos r33509 - break; // reactos r33509 + break; // reactos r33509 new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -764,7 +764,6 @@ } } - /********************************************************************* * * EDIT_CalcLineWidth_SL @@ -892,7 +891,7 @@ if (trailing) index++; } else - index = 0; + index = 0; } else index = es->x_offset; @@ -1216,7 +1215,7 @@ { if (!es->text) { - CHAR *textA = NULL; // ReactOS Hacked! + CHAR *textA = NULL; // ReactOS Hacked! r45670 //UINT countA = 0; if(es->hloc32W) @@ -2216,7 +2215,7 @@ TRACE("line=%d\n", line); - ssa = EDIT_UpdateUniscribeData(es, dc, line); + ssa = EDIT_UpdateUniscribeData(es, dc, line); pos = EDIT_EM_PosFromChar(es, EDIT_EM_LineIndex(es, line), FALSE); x = (short)LOWORD(pos); y = (short)HIWORD(pos); @@ -2257,7 +2256,7 @@ } if (ssa) - ScriptStringOut(ssa, x, y, 0, &es->format_rect, s - li, e - li, FALSE); + ScriptStringOut(ssa, x, y, 0, &es->format_rect, s - li, e - li, FALSE); else if (rev && (s != e) && ((es->flags & EF_FOCUSED) || (es->style & ES_NOHIDESEL))) { x += EDIT_PaintText(es, dc, x, y, line, 0, s - li, FALSE); @@ -2554,7 +2553,7 @@ s = es->selection_start; e = es->selection_end; - EDIT_InvalidateUniscribeData(es); + EDIT_InvalidateUniscribeData(es); if ((s == e) && !strl) return; @@ -3006,8 +3005,8 @@ ulength = strlenW(es->undo_text); utext = HeapAlloc(GetProcessHeap(), 0, (ulength + 1) * sizeof(WCHAR)); - if (utext == NULL) // reactos r33503 - return FALSE; // reactos r33503 + if (utext == NULL) // reactos r33503 + return FALSE; // reactos r33503 strcpyW(utext, es->undo_text); @@ -3273,7 +3272,7 @@ UINT start = es->selection_start; UINT end = es->selection_end; - BOOL selectedItem; + BOOL selectedItem; // reactos r40667 ORDER_UINT(start, end); /* undo */ @@ -3293,6 +3292,7 @@ { RECT rc; /* Windows places the menu at the edit's center in this case */ + // reactos r55202 GetClientRect(es->hwndSelf, &rc); MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); //WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); @@ -3303,7 +3303,7 @@ if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf); -#ifdef __REACTOS__ +#ifdef __REACTOS__ // r40667 selectedItem = TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, es->hwndSelf, NULL); // Added see Revision 43925 comments. switch (selectedItem) { @@ -3705,9 +3705,9 @@ (es->style & ES_NOHIDESEL)); dc = hdc ? hdc : BeginPaint(es->hwndSelf, &ps); - /* The dc we use for calculating may not be the one we paint into. - This is the safest action. */ - EDIT_InvalidateUniscribeData(es); + /* The dc we use for calculating may not be the one we paint into. + This is the safest action. */ + EDIT_InvalidateUniscribeData(es); GetClientRect(es->hwndSelf, &rcClient); /* get the background brush */ @@ -3913,8 +3913,8 @@ EDIT_NOTIFY_PARENT(es, EN_CHANGE); } EDIT_EM_ScrollCaret(es); - EDIT_UpdateScrollInfo(es); - EDIT_InvalidateUniscribeData(es); + EDIT_UpdateScrollInfo(es); + EDIT_InvalidateUniscribeData(es); } @@ -4645,7 +4645,7 @@ { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; -#ifdef __REACTOS__ +#ifdef __REACTOS__ // r50219 PWND pWnd; pWnd = ValidateHwnd(hwnd); @@ -4909,7 +4909,7 @@ result = EDIT_WM_NCDestroy(es); // es = NULL; reactos #ifdef __REACTOS__ - NtUserSetWindowFNID(hwnd, FNID_DESTROY); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif break; @@ -5204,6 +5204,7 @@ return result; } +// reactos /********************************************************************* * * EditWndProc (USER32.@) @@ -5230,6 +5231,7 @@ { editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ + // reactos EditWndProcA, /* procA */ EditWndProcW, /* procW */ #ifndef _WIN64

12 years, 7 months

[akhaldi] 56208: [CMAKE] * Properly handle the dep file creation for resource files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 21 16:46:49 2012 New Revision: 56208 URL: http://svn.reactos.org/svn/reactos?rev=56208&view=rev Log: [CMAKE] * Properly handle the dep file creation for resource files. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56208&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Mar 21 16:46:49 2012 @@ -168,6 +168,7 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") +set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"<CMAKE_C_COMPILER> -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\"") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT)

12 years, 7 months

[tfaber] 56207: [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP] - Do not use RtlFillMemory with a 32 bit pattern (CID 13722)

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 21 15:36:59 2012 New Revision: 56207 URL: http://svn.reactos.org/svn/reactos?rev=56207&view=rev Log: [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP] - Do not use RtlFillMemory with a 32 bit pattern (CID 13722) Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Wed Mar 21 15:36:59 2012 @@ -75,7 +75,7 @@ OUT PSOCKADDR Sockaddr, OUT PINT SockaddrLength) { - DWORD Size = 2 * sizeof(UINT); + INT Size = 2 * sizeof(UINT); if (*SockaddrLength < Size) { @@ -184,10 +184,15 @@ } break; + case SOL_SOCKET: + DPRINT1("SOL_SOCKET option %d\n", OptionName); + break; + default: DPRINT1("Unknown level: %d\n", Level); - return 0; - } + break; + } + return 0; } INT @@ -215,7 +220,7 @@ OUT PSOCKADDR Sockaddr, OUT PINT SockaddrLength) { - DWORD Size = 2 * sizeof(UINT); + INT Size = 2 * sizeof(UINT); if (*SockaddrLength < Size) { @@ -456,7 +461,7 @@ } Context->RequestQueue = NULL; break; - + default: DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent); break; Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=562… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Mar 21 15:36:59 2012 @@ -1464,7 +1464,7 @@ } /* Start preparing the 1st page. Fill it with the default filler */ - RtlFillMemory(Base, PAGE_SIZE, DPH_FILL); + RtlFillMemoryUlong(Base, PAGE_SIZE, DPH_FILL); /* Set flags in the "HEAP" structure */ HeapPtr = (PHEAP)Base;

12 years, 7 months

[cgutman] 56206: [NTOSKRNL] - Once again require a reboot for driver replacement since this seems to cause new issues with devices being enumerated multiple times on vmware

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 21 15:19:42 2012 New Revision: 56206 URL: http://svn.reactos.org/svn/reactos?rev=56206&view=rev Log: [NTOSKRNL] - Once again require a reboot for driver replacement since this seems to cause new issues with devices being enumerated multiple times on vmware Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Wed Mar 21 15:19:42 2012 @@ -597,15 +597,17 @@ /* Check if there's already a driver loaded for this device */ if (DeviceNode->Flags & DNF_ADDED) { +#if 0 /* Remove the device node */ Status = IopRemoveDevice(DeviceNode); if (NT_SUCCESS(Status)) { /* Invalidate device relations for the parent to reenumerate the device */ + DPRINT1("A new driver will be loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - DPRINT1("A new driver has been loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); } else +#endif { /* A driver has already been loaded for this device */ DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); @@ -623,8 +625,8 @@ if (NT_SUCCESS(Status)) { /* Start the service and begin PnP initialization of the device again */ + DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); } }

12 years, 7 months

[cgutman] 56205: [NTOSKRNL] - Print the parent devices when a duplicate device is detected

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 21 15:10:15 2012 New Revision: 56205 URL: http://svn.reactos.org/svn/reactos?rev=56205&view=rev Log: [NTOSKRNL] - Print the parent devices when a duplicate device is detected Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 21 15:10:15 2012 @@ -2006,7 +2006,12 @@ OldDeviceObject = IopGetDeviceObjectFromDeviceInstance(&InstancePathU); if (OldDeviceObject != NULL) { + PDEVICE_NODE OldDeviceNode = IopGetDeviceNode(OldDeviceObject); + DPRINT1("Duplicate device instance '%wZ'\n", &InstancePathU); + DPRINT1("Current instance parent: '%wZ'\n", &DeviceNode->Parent->InstancePath); + DPRINT1("Old instance parent: '%wZ'\n", &OldDeviceNode->Parent->InstancePath); + KeBugCheckEx(PNP_DETECTED_FATAL_ERROR, 0x01, (ULONG_PTR)DeviceNode->PhysicalDeviceObject,

12 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
36
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 March 2012