Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rnaumann] 73593: [SUBST] improve/fix German translation. Patch by "Joefish". CORE-12654 #resolve
by rnaumann＠svn.reactos.org 24 Jan '17

24 Jan '17

Author: rnaumann Date: Tue Jan 24 22:22:58 2017 New Revision: 73593 URL: http://svn.reactos.org/svn/reactos?rev=73593&view=rev Log: [SUBST] improve/fix German translation. Patch by "Joefish". CORE-12654 #resolve Modified: trunk/reactos/base/system/subst/lang/de-DE.rc Modified: trunk/reactos/base/system/subst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/de-… ============================================================================== --- trunk/reactos/base/system/subst/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/de-DE.rc [iso-8859-1] Tue Jan 24 22:22:58 2017 @@ -4,17 +4,17 @@ BEGIN IDS_INCORRECT_PARAMETER_COUNT "Falsche Anzahl an Parametern - %s\n" IDS_INVALID_PARAMETER "Falsche Anzahl an Parametern - %s\n" - IDS_INVALID_PARAMETER2 "Falscher Parameter - %s\n" - IDS_PATH_NOT_FOUND "Path not found - %s\n" - IDS_ACCESS_DENIED "Access denied - %s\n" + IDS_INVALID_PARAMETER2 "UngÃ¼ltiger Parameter - %s\n" + IDS_PATH_NOT_FOUND "Pfad nicht gefunden - %s\n" + IDS_ACCESS_DENIED "Zugriff verweigert - %s\n" IDS_DRIVE_ALREADY_SUBSTED "SUBST wurde hier schon ausgefÃ¼hrt.\n" IDS_FAILED_WITH_ERRORCODE "Fehlgeschlagen - Code 0x%x: %s\n" - IDS_USAGE "Weist einem Pfad einen Laufwerksbuchstaben zu.n\n\ + IDS_USAGE "Weist einem Pfad einen Laufwerksbuchstaben zu.\n\n\ SUBST [Laufwerk1: [Laufwerk2:]Pfad]\n\ SUBST Laufwerk1: /D\n\n\ Laufwerk1: Laufwerksbezeichnung, die dem Pfad zugewiesen werden soll.\n\ [Laufwerk2:]Pfad Laufwerk und Pfad, die als virtuelles Laufwerk (Laufwerk1:)\n\ - angesprochen werden sollen.\n\ + zugewiesen werden sollen.\n\ /D LÃ¶scht ein virtuelles Laufwerk.\n\n\ -SUBST ohne Parameter zeigt alle bereits erstellten, virtuellen Laufwerke an.\n" +SUBST ohne Parameter zeigt alle aktiven virtuellen Laufwerke an.\n" END

1 0

[rnaumann] 73592: [HELP] Small grammar correction. Based on parch by Doug Lyons. CORE-12669 #resolve
by rnaumann＠svn.reactos.org 24 Jan '17

24 Jan '17

Author: rnaumann Date: Tue Jan 24 22:18:24 2017 New Revision: 73592 URL: http://svn.reactos.org/svn/reactos?rev=73592&view=rev Log: [HELP] Small grammar correction. Based on parch by Doug Lyons. CORE-12669 #resolve Modified: trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/lang/en-US.rc [iso-8859-1] Tue Jan 24 22:18:24 2017 @@ -38,7 +38,7 @@ GOTO Directs the ReactOS command interpreter to a labeled line in\n\ a batch program.\n\ HELP Provides Help information for ReactOS commands.\n\ -HISTORY List all commands which has been used\n\ +HISTORY Lists all commands which have been used.\n\ IF Performs conditional processing in batch programs.\n\ LABEL Creates, changes, or deletes the volume label of a disk.\n\ MD Creates a directory.\n\

1 0

[gadamopoulos] 73591: [SHELL32] - CDefaultContextMenu: Fix the implementation of the QueryContextMenu to respect how IContextMenu should function. Don't ignore idCmdFirst and idCmdLast parameters. ...
by gadamopoulos＠svn.reactos.org 24 Jan '17

24 Jan '17

Author: gadamopoulos Date: Tue Jan 24 16:35:36 2017 New Revision: 73591 URL: http://svn.reactos.org/svn/reactos?rev=73591&view=rev Log: [SHELL32] - CDefaultContextMenu: Fix the implementation of the QueryContextMenu to respect how IContextMenu should function. Don't ignore idCmdFirst and idCmdLast parameters. Return a correct HRESULT. For now I'm not sure how 0 cmd ids should be handled and if the standard menu items should also be affected by these parameters. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Tue Jan 24 16:35:36 2017 @@ -76,6 +76,8 @@ PStaticShellEntry m_pStaticEntries; /* first static shell extension entry */ UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ + UINT m_iIdCBFirst; /* first callback used id */ + UINT m_iIdCBLast; /* last callback used id */ HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam); void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb); @@ -84,8 +86,7 @@ HRESULT LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid); BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); UINT InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT IndexMenu, UINT idCmdFirst, UINT idCmdLast); - UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); - UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); + UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu, UINT iIdCmdFirst, UINT iIdCmdLast); HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); @@ -146,7 +147,9 @@ m_iIdSHELast(0), m_pStaticEntries(NULL), m_iIdSCMFirst(0), - m_iIdSCMLast(0) + m_iIdSCMLast(0), + m_iIdCBFirst(0), + m_iIdCBLast(0) { } @@ -470,8 +473,6 @@ } PDynamicShellEntry pEntry = m_pDynamicEntries; - idCmdFirst = 0x5000; - idCmdLast = 0x6000; m_iIdSHEFirst = idCmdFirst; do { @@ -482,6 +483,13 @@ pEntry->NumIds = LOWORD(hr); IndexMenu += pEntry->NumIds; idCmdFirst += pEntry->NumIds + 0x10; + + if(idCmdFirst >= idCmdLast) + { + /* There is no more room for items */ + idCmdFirst = idCmdLast; + break; + } } TRACE("pEntry %p hr %x contextmenu %p cmdfirst %x num ids %x\n", pEntry, hr, pEntry->pCM, pEntry->iIdCmdFirst, pEntry->NumIds); pEntry = pEntry->pNext; @@ -495,7 +503,9 @@ UINT CDefaultContextMenu::AddStaticContextMenusToMenu( HMENU hMenu, - UINT IndexMenu) + UINT IndexMenu, + UINT iIdCmdFirst, + UINT iIdCmdLast) { MENUITEMINFOW mii; UINT idResource; @@ -505,7 +515,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.wID = 0x4000; + mii.wID = iIdCmdFirst; mii.dwTypeData = NULL; m_iIdSCMFirst = mii.wID; @@ -590,6 +600,9 @@ mii.wID++; pEntry = pEntry->pNext; + + if (mii.wID >= iIdCmdLast) + break; } m_iIdSCMLast = mii.wID - 1; @@ -645,6 +658,11 @@ UINT uFlags) { HRESULT hr; + UINT idCmdNext = idCmdFirst; + + /* Add a tiny hack to make all the shell happy until we understand how we should handle 0 ids */ + if (!idCmdNext) + idCmdNext = 1; TRACE("BuildShellItemContextMenu entered\n"); @@ -656,35 +674,40 @@ } /* Add static context menu handlers */ - IndexMenu = AddStaticContextMenusToMenu(hMenu, IndexMenu); + IndexMenu = AddStaticContextMenusToMenu(hMenu, IndexMenu, idCmdNext, idCmdLast); + if (m_iIdSCMLast && m_iIdSCMFirst != m_iIdSCMLast) + idCmdNext = m_iIdSCMLast + 1; /* Add dynamic context menu handlers */ BOOL bAddSep = FALSE; - IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, idCmdFirst, idCmdLast); - TRACE("IndexMenu %d\n", IndexMenu); + IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, idCmdNext, idCmdLast); + if (m_iIdSHELast && m_iIdSHELast != m_iIdSHEFirst) + idCmdNext = m_iIdSHELast + 1; /* Now let the callback add its own items */ - QCMINFO qcminfo; - qcminfo.hmenu = hMenu; - qcminfo.indexMenu = IndexMenu; - qcminfo.idCmdFirst = idCmdFirst; - qcminfo.idCmdLast = idCmdLast; - qcminfo.pIdMap = NULL; - _DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo); + QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL}; + if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo))) + { + m_iIdCBFirst = idCmdNext; + m_iIdCBLast = qcminfo.idCmdFirst; + idCmdNext = m_iIdCBLast + 1; + } + + /* The rest of the items will be added in the end of the menu */ IndexMenu = GetMenuItemCount(hMenu); if (uFlags & CMF_VERBSONLY) - return S_OK; + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); /* If this is a background context menu we are done */ if (!m_cidl) - return S_OK; + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); /* Get the attributes of the items */ SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; hr = m_psf->GetAttributesOf(m_cidl, m_apidl, &rfg); if (FAILED_UNEXPECTEDLY(hr)) - return S_OK; + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst); /* Add the standard menu entries based on the attributes of the items */ BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); @@ -1206,9 +1229,6 @@ Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: - - _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); - Result = E_UNEXPECTED; break; } @@ -1216,21 +1236,27 @@ /* Check for ID's we didn't find a handler for */ if (Result == E_UNEXPECTED) { - if (m_iIdSHEFirst && m_iIdSHELast) + if (m_pDynamicEntries) { if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdSHEFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdSHELast) Result = DoDynamicShellExtensions(&LocalInvokeInfo); } - if (m_iIdSCMFirst && m_iIdSCMLast) + if (m_pStaticEntries) { if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdSCMFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdSCMLast) Result = DoStaticShellExtensions(&LocalInvokeInfo); } + + if (m_iIdCBFirst != m_iIdCBLast) + { + if (LOWORD(LocalInvokeInfo.lpVerb) >= m_iIdCBFirst && LOWORD(LocalInvokeInfo.lpVerb) <= m_iIdCBLast) + Result = _DoCallback(DFM_INVOKECOMMAND, LOWORD(LocalInvokeInfo.lpVerb), NULL); + } } if (Result == E_UNEXPECTED) - FIXME("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); + ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); return Result; } Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Tue Jan 24 16:35:36 2017 @@ -76,23 +76,23 @@ if (!(dwFlags & FILE_READ_ONLY_VOLUME) && GetDriveTypeA(szDrive) != DRIVE_REMOTE) { _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + _InsertMenuItemW(pqcminfo->hmenu, pqcminfo->indexMenu++, TRUE, pqcminfo->idCmdFirst++, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); } } } else if (uMsg == DFM_INVOKECOMMAND) { - if(wParam == 0x7ABC) - { - SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); - } - else if (wParam == DFM_CMD_PROPERTIES) + if (wParam == DFM_CMD_PROPERTIES) { WCHAR wszBuf[4]; wcscpy(wszBuf, L"A:\\"); wszBuf[0] = (WCHAR)szDrive[0]; if (!SH_ShowDriveProperties(wszBuf, pidlFolder, apidl)) hr = E_FAIL; + } + else + { + SHFormatDrive(hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); } }

1 0

[hbelusca] 73590: [WELCOME] - Start implementing the possibility of customizing the Welcome.exe utility using configuration INI files (e.g. what we would do for FOSDEM, CLT, etc...) - Resources cle...
by hbelusca＠svn.reactos.org 24 Jan '17

24 Jan '17

Author: hbelusca Date: Tue Jan 24 14:42:07 2017 New Revision: 73590 URL: http://svn.reactos.org/svn/reactos?rev=73590&view=rev Log: [WELCOME] - Start implementing the possibility of customizing the Welcome.exe utility using configuration INI files (e.g. what we would do for FOSDEM, CLT, etc...) - Resources cleanup. Modified: trunk/reactos/base/setup/welcome/lang/bg-BG.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/da-DK.rc trunk/reactos/base/setup/welcome/lang/de-DE.rc trunk/reactos/base/setup/welcome/lang/el-GR.rc trunk/reactos/base/setup/welcome/lang/en-US.rc trunk/reactos/base/setup/welcome/lang/es-ES.rc trunk/reactos/base/setup/welcome/lang/et-EE.rc trunk/reactos/base/setup/welcome/lang/fr-FR.rc trunk/reactos/base/setup/welcome/lang/he-IL.rc trunk/reactos/base/setup/welcome/lang/hu-HU.rc trunk/reactos/base/setup/welcome/lang/id-ID.rc trunk/reactos/base/setup/welcome/lang/it-IT.rc trunk/reactos/base/setup/welcome/lang/ja-JP.rc trunk/reactos/base/setup/welcome/lang/lt-LT.rc trunk/reactos/base/setup/welcome/lang/ms-MY.rc trunk/reactos/base/setup/welcome/lang/nl-NL.rc trunk/reactos/base/setup/welcome/lang/no-NO.rc trunk/reactos/base/setup/welcome/lang/pl-PL.rc trunk/reactos/base/setup/welcome/lang/pt-BR.rc trunk/reactos/base/setup/welcome/lang/ro-RO.rc trunk/reactos/base/setup/welcome/lang/ru-RU.rc trunk/reactos/base/setup/welcome/lang/sk-SK.rc trunk/reactos/base/setup/welcome/lang/sq-AL.rc trunk/reactos/base/setup/welcome/lang/sv-SE.rc trunk/reactos/base/setup/welcome/lang/th-TH.rc trunk/reactos/base/setup/welcome/lang/tr-TR.rc trunk/reactos/base/setup/welcome/lang/uk-UA.rc trunk/reactos/base/setup/welcome/lang/zh-CN.rc trunk/reactos/base/setup/welcome/lang/zh-TW.rc trunk/reactos/base/setup/welcome/resource.h trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/setup/welcome/welcome.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/bg… Modified: trunk/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/cs… Modified: trunk/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/da… Modified: trunk/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/de… Modified: trunk/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/el… Modified: trunk/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/en… Modified: trunk/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/es… Modified: trunk/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/et… Modified: trunk/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/fr… Modified: trunk/reactos/base/setup/welcome/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/he… Modified: trunk/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/hu… Modified: trunk/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/id… Modified: trunk/reactos/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/it… Modified: trunk/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ja… Modified: trunk/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/lt… Modified: trunk/reactos/base/setup/welcome/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ms… Modified: trunk/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/nl… Modified: trunk/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/no… Modified: trunk/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pl… Modified: trunk/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pt… Modified: trunk/reactos/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ro… Modified: trunk/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ru… Modified: trunk/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sk… Modified: trunk/reactos/base/setup/welcome/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sq… Modified: trunk/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sv… Modified: trunk/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/th… Modified: trunk/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/tr… Modified: trunk/reactos/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/uk… Modified: trunk/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… Modified: trunk/reactos/base/setup/welcome/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… Modified: trunk/reactos/base/setup/welcome/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/resourc… Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome…

1 0

[hbelusca] 73589: [i8042prt]: Yet another hack for Dell Latitude E4310 for touchpad. CORE-12434
by hbelusca＠svn.reactos.org 24 Jan '17

24 Jan '17

Author: hbelusca Date: Tue Jan 24 00:58:52 2017 New Revision: 73589 URL: http://svn.reactos.org/svn/reactos?rev=73589&view=rev Log: [i8042prt]: Yet another hack for Dell Latitude E4310 for touchpad. CORE-12434 Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Tue Jan 24 00:58:52 2017 @@ -66,6 +66,7 @@ { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4310 "}}, FL_INITHACK }, };

1 0

[hbelusca] 73588: [BOOTDATA] - Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd: see r66114 for more details). - Add user-friendly boot menu. [README]: Update ...
by hbelusca＠svn.reactos.org 23 Jan '17

23 Jan '17

Author: hbelusca Date: Mon Jan 23 12:45:51 2017 New Revision: 73588 URL: http://svn.reactos.org/svn/reactos?rev=73588&view=rev Log: [BOOTDATA] - Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd: see r66114 for more details). - Add user-friendly boot menu. [README]: Update the ReadMe.txt for FOSDEM 2017. [VERSION]: Adjust version to 0.4.4-RC FOSDEM 2017. Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -131,32 +131,32 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") # Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -1,3 +1,3 @@ [autorun] -open=bootcd\reactos\welcome.exe +open=setup\reactos\welcome.exe icon=icon.ico Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=Setup -TimeOut=5 +DefaultOS=LiveCD_RamDisk +TimeOut=20 [Display] -TitleText=ReactOS Hybrid-CD +TitleText=ReactOS 0.4.4-RC for FOSDEM 2017 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White @@ -13,62 +13,33 @@ TitleBoxColor=Red MessageBoxTextColor=White MessageBoxColor=Blue -MenuTextColor=Gray -MenuColor=Black -TextColor=Gray +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow SelectedTextColor=Black SelectedColor=Gray -ShowTime=No -MenuBox=No -CenterMenu=No -MinimalUI=Yes -TimeText=Seconds until highlighted choice will be started automatically: +SpecialEffects=Yes [Operating Systems] -Setup="Setup" -LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" -LiveCD_Screen="LiveCD (Screen)" -LiveCD_LogFile="LiveCD (Log file)" -LiveCD_RamDisk="LiveCD in RAM" -LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)" -LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)" +Setup="ReactOS Setup" +LiveCD="ReactOS Live" +LiveCD_RamDisk="ReactOS Live in RAM" +HddBoot="Boot from first hard disk" [Setup] BootType=ReactOSSetup -SystemPath=\bootcd +SystemPath=\setup [LiveCD] BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/MININT - -[LiveCD_Debug] -BootType=Windows2003 -SystemPath=\livecd\reactos +SystemPath=\reactos Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT - -[LiveCD_Screen] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT - -[LiveCD_LogFile] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD -[LiveCD_RamDisk_Debug] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD - -[LiveCD_RamDisk_Screen] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +[HddBoot] +BootType=Drive +BootDrive=hd0 Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -1,7 +1,23 @@ -======================== -ReactOS Version 0.4.x -Updated August 31, 2016 -======================== +================================================================================ +ReactOS Version 0.4.4-RC Preview +for FOSDEM 2017 +================================================================================ + +0. CD-ROM Contents +------------------ + +* ReactOS LiveCD and Installation +* ReactOS on QEMU virtual machine +* ReactOS Build Environment (RosBE) for Windows and Unix-like OSes +* ReactOS source code + +This CD-ROM starts an AutoRun program under Windows. Alternatively you can +browse the contents of this CD-ROM with any file browser. The folder names +should be self-explanatory. + +The source code of ReactOS can be compiled using the ReactOS Build Environment +under Windows or Unix-like operating systems such as Linux. + 1. What is ReactOS? ------------------- Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -318,7 +318,7 @@ set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") #add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "setup/${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() if(_CD_TARGET) @@ -357,7 +357,7 @@ set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") #add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() endif() #end livecd @@ -433,7 +433,7 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION livecd + DESTINATION root FOR hybridcd) get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST) Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Mon Jan 23 12:45:51 2017 @@ -22,10 +22,10 @@ set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "FOSDEM2017RC") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[ekohl] 73587: [FREELDR] Add VESA DDC detection and EDID read code. Work in progress.
by ekohl＠svn.reactos.org 22 Jan '17

22 Jan '17

Author: ekohl Date: Sun Jan 22 15:03:11 2017 New Revision: 73587 URL: http://svn.reactos.org/svn/reactos?rev=73587&view=rev Log: [FREELDR] Add VESA DDC detection and EDID read code. Work in progress. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/include/video.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Jan 22 15:03:11 2017 @@ -1678,6 +1678,18 @@ TRACE("Created key: DisplayController\\0\n"); /* FIXME: Add display peripheral (monitor) data */ + if (VesaVersion != 0) + { + if (BiosIsVesaDdcSupported()) + { + TRACE("VESA/DDC supported!\n"); + if (BiosVesaReadEdid()) + { + TRACE("EDID data read successfully!\n"); + + } + } + } } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Sun Jan 22 15:03:11 2017 @@ -22,7 +22,7 @@ #define NDEBUG #include <debug.h> -DBG_DEFAULT_CHANNEL(UI); +DBG_DEFAULT_CHANNEL(HWDETECT); #include <pshpack2.h> typedef struct @@ -237,3 +237,64 @@ return SvgaInfo->VesaVersion; } + + +BOOLEAN +BiosIsVesaDdcSupported(VOID) +{ + REGS Regs; + + TRACE("BiosIsVesaDdcSupported()\n"); + + Regs.w.ax = 0x4F15; + Regs.b.bl = 0; + Regs.w.cx = 0; + Regs.w.es = 0; + Regs.w.di = 0; + Int386(0x10, &Regs, &Regs); + + TRACE("AL = 0x%x\n", Regs.b.al); + TRACE("AH = 0x%x\n", Regs.b.ah); + + TRACE("BL = 0x%x\n", Regs.b.bl); + + if (Regs.w.ax != 0x004F) + { + ERR("VESA/DDC installation check failed\n"); + return FALSE; + } + + return (Regs.b.ah == 0); +} + + +BOOLEAN +BiosVesaReadEdid(VOID) +{ + REGS Regs; + + TRACE("BiosVesaReadEdid()\n"); + + RtlZeroMemory((PVOID)BIOSCALLBUFFER, 128); + + Regs.w.ax = 0x4F15; + Regs.b.bl = 1; + Regs.w.cx = 0; + Regs.w.dx = 0; + Regs.w.es = BIOSCALLBUFSEGMENT; + Regs.w.di = BIOSCALLBUFOFFSET; + Int386(0x10, &Regs, &Regs); + + TRACE("AL = 0x%x\n", Regs.b.al); + TRACE("AH = 0x%x\n", Regs.b.ah); + + if (Regs.w.ax != 0x004F) + { + ERR("Read EDID function not supported!\n"); + return FALSE; + } + + return (Regs.b.ah == 0); +} + +/* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/include/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/video.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/video.h [iso-8859-1] Sun Jan 22 15:03:11 2017 @@ -30,9 +30,11 @@ extern PVOID VideoOffScreenBuffer; -USHORT BiosIsVesaSupported(VOID); // Implemented in i386vid.c, returns the VESA version +USHORT BiosIsVesaSupported(VOID); // Implemented in i386vid.c, returns the VESA version +BOOLEAN BiosIsVesaDdcSupported(VOID); +BOOLEAN BiosVesaReadEdid(VOID); -PVOID VideoAllocateOffScreenBuffer(VOID); // Returns a pointer to an off-screen buffer sufficient for the current video mode +PVOID VideoAllocateOffScreenBuffer(VOID); // Returns a pointer to an off-screen buffer sufficient for the current video mode VOID VideoCopyOffScreenBufferToVRAM(VOID);

1 0

[jgardou] 73586: [CDFS] - Reduce stack usage by manipulating UNICODE_STRINGS we are given instead of copying it a gazillion times - Do not assume said strings are null-terminated
by jgardou＠svn.reactos.org 22 Jan '17

22 Jan '17

Author: jgardou Date: Sun Jan 22 11:55:29 2017 New Revision: 73586 URL: http://svn.reactos.org/svn/reactos?rev=73586&view=rev Log: [CDFS] - Reduce stack usage by manipulating UNICODE_STRINGS we are given instead of copying it a gazillion times - Do not assume said strings are null-terminated Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sun Jan 22 11:55:29 2017 @@ -39,28 +39,22 @@ /* FUNCTIONS ****************************************************************/ -static PWCHAR -CdfsGetNextPathElement(PWCHAR FileName) -{ - if (*FileName == L'\0') - { - return(NULL); - } - - while (*FileName != L'\0' && *FileName != L'\\') - { - FileName++; - } - - return(FileName); -} - - -static VOID -CdfsWSubString(LPWSTR pTarget, LPCWSTR pSource, size_t pLength) -{ - wcsncpy (pTarget, pSource, pLength); - pTarget [pLength] = L'\0'; +static BOOLEAN +CdfsGetNextPathElement(PCUNICODE_STRING CurrentElement, PUNICODE_STRING NextElement) +{ + *NextElement = *CurrentElement; + + if (NextElement->Length == 0) + return FALSE; + + while ((NextElement->Length) && (NextElement->Buffer[0] != L'\\')) + { + NextElement->Buffer++; + NextElement->Length -= sizeof(WCHAR); + NextElement->MaximumLength -= sizeof(WCHAR); + } + + return TRUE; } @@ -607,11 +601,9 @@ PUNICODE_STRING FileName) { UNICODE_STRING PathName; - UNICODE_STRING ElementName; + UNICODE_STRING NextElement; + UNICODE_STRING CurrentElement; NTSTATUS Status; - WCHAR pathName [MAX_PATH]; - WCHAR elementName [MAX_PATH]; - PWCHAR currentElement; PFCB FCB; PFCB parentFCB; @@ -622,7 +614,8 @@ FileName); /* Trivial case, open of the root directory on volume */ - if (FileName->Buffer[0] == L'\0' || wcscmp(FileName->Buffer, L"\\") == 0) + if (FileName->Length == 0 || + ((FileName->Buffer[0] == '\\') && (FileName->Length == sizeof(WCHAR)))) { DPRINT("returning root FCB\n"); @@ -634,23 +627,28 @@ } else { - currentElement = &FileName->Buffer[1]; - wcscpy (pathName, L"\\"); + /* Start with empty path */ + PathName = *FileName; + PathName.Length = 0; + CurrentElement = *FileName; + FCB = CdfsOpenRootFCB (Vcb); } parentFCB = NULL; /* Parse filename and check each path element for existence and access */ - while (CdfsGetNextPathElement(currentElement) != 0) + while (CdfsGetNextPathElement(&CurrentElement, &NextElement)) { /* Skip blank directory levels */ - if ((CdfsGetNextPathElement(currentElement) - currentElement) == 0) - { - currentElement++; + if (CurrentElement.Buffer[0] == L'\\') + { + CurrentElement.Buffer++; + CurrentElement.Length -= sizeof(WCHAR); + CurrentElement.MaximumLength -= sizeof(WCHAR); continue; } - DPRINT("Parsing, currentElement:%S\n", currentElement); + DPRINT("Parsing, currentElement:%wZ\n", &CurrentElement); DPRINT(" parentFCB:%p FCB:%p\n", parentFCB, FCB); /* Descend to next directory level */ @@ -674,33 +672,26 @@ } parentFCB = FCB; - /* Extract next directory level into dirName */ - CdfsWSubString(pathName, - FileName->Buffer, - CdfsGetNextPathElement(currentElement) - FileName->Buffer); - DPRINT(" pathName:%S\n", pathName); - - RtlInitUnicodeString(&PathName, pathName); + /* Extract next directory level */ + PathName.Length = (NextElement.Buffer - FileName->Buffer) * sizeof(WCHAR); + DPRINT(" PathName:%wZ\n", &PathName); FCB = CdfsGrabFCBFromTable(Vcb, &PathName); if (FCB == NULL) { - CdfsWSubString(elementName, - currentElement, - CdfsGetNextPathElement(currentElement) - currentElement); - DPRINT(" elementName:%S\n", elementName); - - RtlInitUnicodeString(&ElementName, elementName); + UNICODE_STRING ChildElement = CurrentElement; + ChildElement.Length = (NextElement.Buffer - CurrentElement.Buffer) * sizeof(WCHAR); + Status = CdfsDirFindFile(Vcb, parentFCB, - &ElementName, + &ChildElement, &FCB); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { *pParentFCB = parentFCB; *pFCB = NULL; - currentElement = CdfsGetNextPathElement(currentElement); - if (*currentElement == L'\0' || CdfsGetNextPathElement(currentElement + 1) == 0) + + if (NextElement.Length == 0) { return(STATUS_OBJECT_NAME_NOT_FOUND); } @@ -718,7 +709,7 @@ return(Status); } } - currentElement = CdfsGetNextPathElement(currentElement); + CurrentElement = NextElement; } *pParentFCB = parentFCB;

1 0

[ekohl] 73585: [ADVAPI32] Add I_ScIsSecurityProcess() stub.
by ekohl＠svn.reactos.org 21 Jan '17

21 Jan '17

Author: ekohl Date: Sat Jan 21 11:57:43 2017 New Revision: 73585 URL: http://svn.reactos.org/svn/reactos?rev=73585&view=rev Log: [ADVAPI32] Add I_ScIsSecurityProcess() stub. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sat Jan 21 11:57:43 2017 @@ -295,7 +295,7 @@ 295 stdcall GetUserNameW(ptr ptr) 296 stdcall GetWindowsAccountDomainSid(ptr ptr ptr) 297 stub I_QueryTagInformation -298 stub I_ScIsSecurityProcess +298 stdcall I_ScIsSecurityProcess() 299 stdcall I_ScPnPGetServiceName(ptr wstr long) 300 stub I_ScSendTSMessage 301 stdcall I_ScSetServiceBitsA(ptr long long long str) Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sat Jan 21 11:57:43 2017 @@ -744,6 +744,20 @@ /********************************************************************** + * I_ScIsSecurityProcess + * + * Undocumented + * + * @unimplemented + */ +VOID +WINAPI +I_ScIsSecurityProcess(VOID) +{ +} + + +/********************************************************************** * I_ScPnPGetServiceName * * Undocumented

1 0

[hbelusca] 73584: [PSDK]: Add the declarations for IsNetDrive, DriveType and RealDriveType functions (from shell32).
by hbelusca＠svn.reactos.org 19 Jan '17

19 Jan '17

Author: hbelusca Date: Thu Jan 19 19:39:53 2017 New Revision: 73584 URL: http://svn.reactos.org/svn/reactos?rev=73584&view=rev Log: [PSDK]: Add the declarations for IsNetDrive, DriveType and RealDriveType functions (from shell32). Modified: trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Thu Jan 19 19:39:53 2017 @@ -250,6 +250,9 @@ #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) int WINAPI RestartDialog(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD); int WINAPI RestartDialogEx(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD, DWORD); +int WINAPI DriveType(int); +int WINAPI RealDriveType(int, BOOL); +int WINAPI IsNetDrive(int); BOOL WINAPI IsUserAnAdmin(void); #define KF_FLAG_DEFAULT_PATH 0x00000400

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs