Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 73663: [MSPORTS] - Check for failure when calling SetupDiGetActualSectionToInstallW so we don't pass garbage to SetupInstallFromInfSectionW. CID 715920
by khornicek＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: khornicek Date: Wed Feb 1 18:36:40 2017 New Revision: 73663 URL: http://svn.reactos.org/svn/reactos?rev=73663&view=rev Log: [MSPORTS] - Check for failure when calling SetupDiGetActualSectionToInstallW so we don't pass garbage to SetupInstallFromInfSectionW. CID 715920 Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Wed Feb 1 18:36:40 2017 @@ -579,12 +579,13 @@ TRACE("Section name: %S\n", DriverInfoDetailData->SectionName); - SetupDiGetActualSectionToInstallW(hInf, - DriverInfoDetailData->SectionName, - InfSectionWithExt, - 256, - NULL, - NULL); + if (!SetupDiGetActualSectionToInstallW(hInf, + DriverInfoDetailData->SectionName, + InfSectionWithExt, + 256, + NULL, + NULL)) + goto done; TRACE("InfSectionWithExt: %S\n", InfSectionWithExt);

1 0

[khornicek] 73662: [TRANSLATIONS] - fix, update and add some czech translations + two tiny "improvements" in english ones In case anyone wants to continue - these modules lack czech resources compl...
by khornicek＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: khornicek Date: Wed Feb 1 14:45:59 2017 New Revision: 73662 URL: http://svn.reactos.org/svn/reactos?rev=73662&view=rev Log: [TRANSLATIONS] - fix, update and add some czech translations + two tiny "improvements" in english ones In case anyone wants to continue - these modules lack czech resources completely: (and I suggest doing getuname first) clip comp doskey eventcreate mode taskkill tree whoami wmic xcopy ipconfig net clb diskpart acppage fontext browseui getuname iernonce lsasrv modemui msports rasdlg samsrv tapiui localmon Added: trunk/reactos/base/applications/clipbrd/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/magnify/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/osk/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/wordpad/lang/cs-CZ.rc (with props) trunk/reactos/base/system/runonce/lang/cs-CZ.rc (with props) trunk/reactos/base/system/services/lang/cs-CZ.rc (with props) trunk/reactos/base/system/subst/lang/cs-CZ.rc (with props) trunk/reactos/dll/shellext/ntobjshex/lang/cs-CZ.rc (with props) trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/aclui/lang/cs-CZ.rc (with props) trunk/reactos/media/themes/lautus.msstyles/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/fontview/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/magnify/magnify.rc trunk/reactos/base/applications/mmc/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/osk/rsrc.rc trunk/reactos/base/applications/regedit/clb/CMakeLists.txt trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/wordpad/lang/en-US.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/shell/explorer/lang/cs-CZ.rc trunk/reactos/base/system/runonce/runonce.rc trunk/reactos/base/system/services/services.rc trunk/reactos/base/system/subst/subst.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/slayer/lang/cs-CZ.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netid/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/media/themes/lautus.msstyles/lautus.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc trunk/reactos/win32ss/user/user32/lang/en-US.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv_new/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Added: trunk/reactos/base/applications/games/spider/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/magnify/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/osk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/osk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/rsrc… Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/screensavers/3dtext/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Added: trunk/reactos/base/applications/screensavers/logon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Added: trunk/reactos/base/applications/wordpad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… Modified: trunk/reactos/base/shell/explorer/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/c… Added: trunk/reactos/base/system/runonce/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/c… Modified: trunk/reactos/base/system/runonce/runonce.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/runonc… Added: trunk/reactos/base/system/services/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Added: trunk/reactos/base/system/subst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/cs-… Modified: trunk/reactos/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.rc… Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… Modified: trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/cs… Modified: trunk/reactos/dll/shellext/deskadp/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Added: trunk/reactos/dll/shellext/ntobjshex/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… Modified: trunk/reactos/dll/shellext/slayer/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/c… Added: trunk/reactos/dll/shellext/stobject/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… Added: trunk/reactos/dll/win32/aclui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/cs-CZ… Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… Modified: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… Modified: trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/cs… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/cs-… Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… Added: trunk/reactos/media/themes/lautus.msstyles/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… Modified: trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/c… Modified: trunk/reactos/win32ss/user/user32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…

1 0

[gadamopoulos] 73661: [SHELL32] - CDefView: Implement rudimentary support for drag icons. For now we only show the icon of the first item (no caption or other icons yet).
by gadamopoulos＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: gadamopoulos Date: Wed Feb 1 14:22:45 2017 New Revision: 73661 URL: http://svn.reactos.org/svn/reactos?rev=73661&view=rev Log: [SHELL32] - CDefView: Implement rudimentary support for drag icons. For now we only show the icon of the first item (no caption or other icons yet). Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Wed Feb 1 14:22:45 2017 @@ -1740,6 +1740,8 @@ if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda)))) { + LPNMLISTVIEW params = (LPNMLISTVIEW)lParam; + if (SUCCEEDED(m_pSFParent->GetAttributesOf(m_cidl, m_apidl, &dwAttributes))) { if (dwAttributes & SFGAO_CANLINK) @@ -1757,8 +1759,17 @@ DWORD dwEffect2; m_pSourceDataObject = pda; - m_ptFirstMousePos = ((LPNMLISTVIEW)lParam)->ptAction; + m_ptFirstMousePos = params->ptAction; ClientToScreen(&m_ptFirstMousePos); + + HIMAGELIST big_icons, small_icons; + Shell_GetImageLists(&big_icons, &small_icons); + PCUITEMID_CHILD pidl = _PidlByItem(params->iItem); + int iIcon = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); + POINT ptItem; + m_ListView.GetItemPosition(params->iItem, &ptItem); + + ImageList_BeginDrag(big_icons, iIcon, m_ptFirstMousePos.x - ptItem.x, m_ptFirstMousePos.y - ptItem.y); DoDragDrop(pda, this, dwEffect, &dwEffect2); @@ -2913,34 +2924,44 @@ /* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */ if (FAILED(hr)) + { + *pdwEffect = DROPEFFECT_NONE; return hr; + } + + if (m_iDragOverItem != -1) + { + SelectItem(m_iDragOverItem, SVSI_SELECT); + } /* Notify the item just entered via DragEnter. */ - hr = m_pCurDropTarget->DragEnter(m_pCurDataObject, grfKeyState, pt, pdwEffect); - - if (m_iDragOverItem != -1 && pdwEffect != DROPEFFECT_NONE) - { - SelectItem(m_iDragOverItem, SVSI_SELECT); - } - - return hr; + return m_pCurDropTarget->DragEnter(m_pCurDataObject, grfKeyState, pt, pdwEffect); } HRESULT WINAPI CDefView::DragEnter(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { + POINT ptClient = {pt.x, pt.y}; + ScreenToClient(&ptClient); + /* Get a hold on the data object for later calls to DragEnter on the sub-folders */ m_pCurDataObject = pDataObject; + ImageList_DragEnter(m_hWnd, ptClient.x, ptClient.y); return drag_notify_subitem(grfKeyState, pt, pdwEffect); } HRESULT WINAPI CDefView::DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { + POINT ptClient = {pt.x, pt.y}; + ScreenToClient(&ptClient); + ImageList_DragMove(ptClient.x, ptClient.y); return drag_notify_subitem(grfKeyState, pt, pdwEffect); } HRESULT WINAPI CDefView::DragLeave() { + ImageList_DragLeave(m_hWnd); + if (m_pCurDropTarget) { m_pCurDropTarget->DragLeave(); @@ -2960,6 +2981,8 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); + + ImageList_EndDrag(); if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) && (*pdwEffect & DROPEFFECT_MOVE) &&

1 0

[gadamopoulos] 73660: [SHELL32] Implement support for IID_IDropTarget in CDesktopFolder::GetUIObjectOf and CDrivesFolder::GetUIObjectOf. Fixes dragging items to the icons of My documents, Recycle b...
by gadamopoulos＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: gadamopoulos Date: Wed Feb 1 13:31:55 2017 New Revision: 73660 URL: http://svn.reactos.org/svn/reactos?rev=73660&view=rev Log: [SHELL32] Implement support for IID_IDropTarget in CDesktopFolder::GetUIObjectOf and CDrivesFolder::GetUIObjectOf. Fixes dragging items to the icons of My documents, Recycle bin or drive. Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Wed Feb 1 13:31:55 2017 @@ -686,6 +686,15 @@ { hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } + else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) + { + CComPtr<IShellFolder> psfChild; + hr = this->BindToObject(apidl[0], NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfChild->CreateViewObject(NULL, riid, ppvOut); + } else hr = E_NOINTERFACE; 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] Wed Feb 1 13:31:55 2017 @@ -631,11 +631,14 @@ else hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } - else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) - { - IDropTarget * pDt = NULL; - hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); - pObj = pDt; + else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) + { + CComPtr<IShellFolder> psfChild; + hr = this->BindToObject(apidl[0], NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfChild->CreateViewObject(NULL, riid, ppvOut); } else hr = E_NOINTERFACE;

1 0

[hbelusca] 73659: - Port the last welcome.exe change from r73658. - Fix the path to welcome settings for the FOSDEM CD. - Add the welcome.exe localized customizations for FOSDEM 2017 CD.
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 04:07:02 2017 New Revision: 73659 URL: http://svn.reactos.org/svn/reactos?rev=73659&view=rev Log: - Port the last welcome.exe change from r73658. - Fix the path to welcome settings for the FOSDEM CD. - Add the welcome.exe localized customizations for FOSDEM 2017 CD. Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini (with props) branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini (with props) branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini (with props) Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ (props changed) branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 1 04:07:02 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654,73656 +/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654,73656-73658 Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Feb 1 04:07:02 2017 @@ -197,7 +197,7 @@ } static BOOL -LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath) +LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) { DWORD dwRet; DWORD dwSize; @@ -236,6 +236,8 @@ return FALSE; // TODO: For localized resource, see the general function. /* Try to load the default localized strings */ + GetPrivateProfileString(TEXT("Defaults"), TEXT("AppTitle"), TEXT("ReactOS Welcome") /* default */, + szAppTitle, ARRAYSIZE(szAppTitle), szIniPath); if (!GetPrivateProfileString(TEXT("Defaults"), TEXT("DefaultTopicTitle"), NULL /* default */, szDefaultTitle, ARRAYSIZE(szDefaultTitle), szIniPath)) { @@ -325,7 +327,7 @@ } static BOOL -LoadTopics(LPTSTR lpResPath) +LoadLocalizedResources(LPTSTR lpResPath) { #define MAX_NUMBER_INTERNAL_TOPICS 3 @@ -339,13 +341,15 @@ * First, try to load the default internal (localized) strings. * They can be redefined by the localized INI files. */ + if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) + StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); if (!LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szDefaultTitle, ARRAYSIZE(szDefaultTitle))) *szDefaultTitle = 0; if (!LoadString(hInstance, IDS_DEFAULTTOPICDESC, szDefaultDesc, ARRAYSIZE(szDefaultDesc))) *szDefaultDesc = 0; - /* Try to load the topics from INI file */ - if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath)) + /* Try to load the resources from INI file */ + if (*lpResPath && LoadLocalizedResourcesFromINI(LOCALE_USER_DEFAULT, lpResPath)) return TRUE; /* We failed, fall back to internal (localized) resource */ @@ -381,7 +385,7 @@ } static VOID -FreeTopics(VOID) +FreeResources(VOID) { if (!pTopics) return; @@ -421,8 +425,8 @@ /* Verify that the file exists, otherwise use the default configuration */ if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) { - /* Use the default configuration and retrieve the default topics */ - return LoadTopics(TEXT("")); + /* Use the default configuration and retrieve the default resources */ + return LoadLocalizedResources(TEXT("")); } /* Load the settings from the INI configuration file */ @@ -435,9 +439,9 @@ *szResPath = 0; } - /* Set the current directory to the one of this application, and retrieve the topics */ + /* Set the current directory to the one of this application, and retrieve the resources */ SetCurrentDirectory(szAppPath); - return LoadTopics(szResPath); + return LoadLocalizedResources(szResPath); } #if 0 @@ -556,10 +560,7 @@ rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) - StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); - - /* Load the configuration and the topics */ + /* Load the configuration and the resources */ LoadConfiguration(); /* Create main window */ @@ -592,7 +593,7 @@ } /* Cleanup */ - FreeTopics(); + FreeResources(); return msg.wParam; } Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Wed Feb 1 04:07:02 2017 @@ -32,7 +32,7 @@ # Welcome.exe optional custom configuration (only for HybridCD) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/) # Copy the main configuration file - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION bootcd/reactos NO_CAB FOR hybridcd) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION setup/reactos NO_CAB FOR hybridcd) # Convert the translation files (name format: xx-YY.ini) into UTF-16 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/welcome_config) @@ -43,7 +43,7 @@ add_custom_command(OUTPUT "${_converted_file}" COMMAND native-utf16le "${_source_file}" "${_converted_file}" DEPENDS native-utf16le "${_source_file}") - add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION bootcd/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) + add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION setup/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) list(APPEND _converted_welcome_i18n_files ${_converted_file}) endforeach(_file) add_custom_target(converted_welcome_i18n_files DEPENDS ${_converted_welcome_i18n_files}) Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini (added) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini [iso-8859-1] Wed Feb 1 04:07:02 2017 @@ -0,0 +1,47 @@ + +[Defaults] +AppTitle = "ReactOS 0.4.4-RC fÃ¼r FOSDEM 2017" +DefaultTopicTitle = "ReactOS" +DefaultTopicDescription = "ReactOS ist ein modernes Open-Source-Betriebssystem, welches auf dem Design von WindowsÂ® XP/2003 basiert. Dazu gehÃ¶rt sowohl die volle KompatibilitÃ¤t mit Windows-Anwendungen und -Treibern als auch eine Ã¤hnliche BenutzeroberflÃ¤che, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode des gesamten Systems ist frei verfÃ¼gbar und steht grÃ¶Ãtenteils unter der GNU General Public License." + +[Topic0] +Button = "ReactOS installieren" +Title = "ReactOS installieren" +Description = "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten mÃ¼ssen, um die Installation zu starten.\n\nAlternativ kÃ¶nnen Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden MenÃ¼punkt auf der linken Seite wÃ¤hlen." +Action = "<msg>Sie mÃ¼ssen Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthÃ¤lt!" + +[Topic1] +Button = "ReactOS in QEMU ausprobieren" +Title = "ReactOS in QEMU ausprobieren" +Description = "MÃ¶glicherweise mÃ¶chten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen kÃ¶nnen, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet das QEMU-Paket in 7-Zip." +Action = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z" + +[Topic2] +Button = "ReactOS Build Environment installieren" +Title = "ReactOS Build Environment installieren" +Description = "Damit ReactOS so einfach wie mÃ¶glich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthÃ¤lt die passenden Compiler-Versionen und alle nÃ¶tigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows XP oder neueren Versionen. Sie wird Ã¼ber diesen MenÃ¼punkt installiert.\nDie CD enthÃ¤lt auch das Build Environment fÃ¼r Unix-Ã¤hnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusÃ¤tzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version." +Action = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe" + +[Topic3] +Button = "ReactOS-Quellcodepaket Ã¶ffnen" +Title = "ReactOS-Quellcodepaket Ã¶ffnen" +Description = "Die CD enthÃ¤lt auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\n\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet ihn in 7-Zip." +Action = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z" + +[Topic4] +Button = "Die ReactOS-Website besuchen" +Title = "Die ReactOS-Website besuchen" +Description = "Die ReactOS-Website liefert viele weitere Informationen Ã¼ber das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezÃ¼glich der Entwicklung." +Action = "https://www.reactos.org/" + +[Topic5] +Button = "Die CD durchsuchen" +Title = "Die CD durchsuchen" +Description = "Durchsuchen Sie den Inhalt dieser CD." +Action = "explorer.exe" + +[Topic6] +Button = "Beenden" +Title = "Beenden" +Description = "Beendet das AutoRun-Programm." +Action = "<exit>" Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini (added) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini [iso-8859-1] Wed Feb 1 04:07:02 2017 @@ -0,0 +1,47 @@ + +[Defaults] +AppTitle = "ReactOS 0.4.4-RC for FOSDEM 2017" +DefaultTopicTitle = "ReactOS" +DefaultTopicDescription = "ReactOS is a modern open source operating system based on the design of WindowsÂ® XP/2003. This encompasses full compatibility with Windows applications and drivers as well as a familiar user interface, such that people accustomed to Windows would find using ReactOS straightforward. The source code of the entire system is available for free under several open source licenses, mostly the GNU General Public License." + +[Topic0] +Button = "Install ReactOS" +Title = "Install ReactOS" +Description = "Installs ReactOS on your computer.\n\nPlease note that you have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nAlternatively, you can easily try out ReactOS in a QEMU virtual machine by choosing the respective menu entry on the left side." +Action = "<msg>You have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not install ReactOS on a computer that contains important data!" + +[Topic1] +Button = "Try out ReactOS in QEMU" +Title = "Try out ReactOS in QEMU" +Description = "Perhaps you don't want to try out an alpha-stage operating system on your own computer or you face problems during the installation. For these cases, we have preinstalled ReactOS on a QEMU virtual machine. This way, you can try out the operating system without needing to install it on your computer.\n\nA click on this menu entry opens the QEMU package in 7-Zip." +Action = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z" + +[Topic2] +Button = "Install ReactOS Build Environment" +Title = "Install ReactOS Build Environment" +Description = "To make building ReactOS as easy as possible, the ReactOS Build Environment has been created. This contains the right compiler versions and all needed tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build Environment is compatible with Windows XP or newer versions. It is installed using this menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this CD." +Action = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe" + +[Topic3] +Button = "Open the ReactOS Source Code Package" +Title = "Open the ReactOS Source Code Package" +Description = "The CD also contains the entire source code of this ReactOS version, which can be compiled using the ReactOS Build Environment.\n\nA click on this menu entry opens it in 7-Zip." +Action = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z" + +[Topic4] +Button = "Visit the ReactOS Website" +Title = "Visit the ReactOS Website" +Description = "The ReactOS Website offers many more information about the project. Here you find the latest ReactOS releases and news regarding the development." +Action = "https://www.reactos.org/" + +[Topic5] +Button = "Browse the CD" +Title = "Browse the CD" +Description = "Browse the contents of this CD." +Action = "explorer.exe" + +[Topic6] +Button = "Exit" +Title = "Exit" +Description = "Exits the AutoRun program." +Action = "<exit>" Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini (added) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini [iso-8859-1] Wed Feb 1 04:07:02 2017 @@ -0,0 +1,47 @@ + +[Defaults] +AppTitle = "ReactOS 0.4.4-RC pour FOSDEM 2017" +DefaultTopicTitle = "ReactOS" +DefaultTopicDescription = "ReactOS est un systÃ¨me d'exploitation moderne basÃ© sur le design de WindowsÂ® XP/2003. Cela signifie une compatibilitÃ© totale avec les applications Ã©crites pour Windows, les pilotes de pÃ©riphÃ©riques ainsi qu'une interface utilisateur familiÃ¨re, afin que les personnes habituÃ©es Ã utiliser Windows trouvent ReactOS simple d'utilisation. L'intÃ©gralitÃ© du code source du systÃ¨me d'exploitation est disponible gratuitement sous diverses licences open source, en majoritÃ© la GNU General Public License." + +[Topic0] +Button = "Installer ReactOS" +Title = "Installer ReactOS" +Description = "Installe ReactOS sur votre ordinateur.\n\nVeuillez noter que vous aurez besoin de redÃ©marrer votre ordinateur tout en ayant le CD de ReactOS insÃ©rÃ© dans le lecteur afin de dÃ©marrer l'installation.\n\nAutrement, vous pouvez aisÃ©ment essayer ReactOS dans une machine virtuelle QEMU en sÃ©lectionnant le bouton adÃ©quat dans le menu Ã gauche." +Action = "<msg>Vous ne pouvez pas encore installer ReactOS directement depuis ce CD ! Veuillez redÃ©marrer votre ordinateur depuis ce CD pour pouvoir installer ReactOS." + +[Topic1] +Button = "Essayer ReactOS sous QEMU" +Title = "Essayer ReactOS sous QEMU" +Description = "Peut-Ãªtre vous ne voulez pas essayer un systÃ¨me d'exploitation alpha sur votre propre ordinateur, ou bien vous faites face Ã des problÃ¨mes lors de l'installation. Afin de pallier Ã ces inconvÃ©nients, nous avons prÃ©installÃ© ReactOS sur une machine virtuelle QEMU. Ainsi, vous pouvez essayer le systÃ¨me d'exploitation sans avoir besoin de l'installer sur votre ordinateur.\n\nUn clic sur ce bouton ouvre le package QEMU avec 7-Zip." +Action = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z" + +[Topic2] +Button = "Installer ReactOS Build Environment" +Title = "Installer ReactOS Build Environment" +Description = "Afin de rendre la compilation de ReactOS aussi simple que possible, l'environnement de dÃ©veloppement ReactOS (ReactOS Build Environment) a Ã©tÃ© crÃ©Ã©. Il comprend les correctes versions des compilateurs ainsi que les outils nÃ©cessaires afin de compiler l'intÃ©gralitÃ© du code source de ReactOS.\n\nLa version Windows de l'environnement de dÃ©veloppement est compatible avec Windows XP ou ultÃ©rieur. Elle est installÃ©e en cliquant sur ce bouton.\n\nEn supplÃ©ment, le code source de cette version de ReactOS est inclus dans ce CD." +Action = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe" + +[Topic3] +Button = "DÃ©couvrir le code source de ReactOS" +Title = "DÃ©couvrir le code source de ReactOS" +Description = "Ce CD contient aussi l'intÃ©gralitÃ© du code source de cette version de ReactOS qui peut Ãªtre compilÃ© en utilisant l'environnement de dÃ©veloppement ReactOS.\n\nUn clic sur ce bouton ouvre l'archive avec 7-Zip." +Action = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z" + +[Topic4] +Button = "Visiter le site Web de ReactOS" +Title = "Visiter le site Web de ReactOS" +Description = "Le site Web de ReactOS fournit plus d'informations Ã propos du projet. Vous y trouverez les derniÃ¨res versions de ReactOS ainsi que des nouvelles concernant son dÃ©veloppement." +Action = "https://www.reactos.org/" + +[Topic5] +Button = "Parcourir le CD" +Title = "Parcourir le CD" +Description = "Parcourir le contenu du CD." +Action = "explorer.exe" + +[Topic6] +Button = "Quitter" +Title = "Quitter" +Description = "Quitte le programme AutoRun." +Action = "<exit>" Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 73658: [WELCOME]: Addendum to r73656: The application title is also customizable! Change also the name of some helper functions.
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 03:51:40 2017 New Revision: 73658 URL: http://svn.reactos.org/svn/reactos?rev=73658&view=rev Log: [WELCOME]: Addendum to r73656: The application title is also customizable! Change also the name of some helper functions. Modified: trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Feb 1 03:51:40 2017 @@ -197,7 +197,7 @@ } static BOOL -LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath) +LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) { DWORD dwRet; DWORD dwSize; @@ -236,6 +236,8 @@ return FALSE; // TODO: For localized resource, see the general function. /* Try to load the default localized strings */ + GetPrivateProfileString(TEXT("Defaults"), TEXT("AppTitle"), TEXT("ReactOS Welcome") /* default */, + szAppTitle, ARRAYSIZE(szAppTitle), szIniPath); if (!GetPrivateProfileString(TEXT("Defaults"), TEXT("DefaultTopicTitle"), NULL /* default */, szDefaultTitle, ARRAYSIZE(szDefaultTitle), szIniPath)) { @@ -325,7 +327,7 @@ } static BOOL -LoadTopics(LPTSTR lpResPath) +LoadLocalizedResources(LPTSTR lpResPath) { #define MAX_NUMBER_INTERNAL_TOPICS 3 @@ -339,13 +341,15 @@ * First, try to load the default internal (localized) strings. * They can be redefined by the localized INI files. */ + if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) + StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); if (!LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szDefaultTitle, ARRAYSIZE(szDefaultTitle))) *szDefaultTitle = 0; if (!LoadString(hInstance, IDS_DEFAULTTOPICDESC, szDefaultDesc, ARRAYSIZE(szDefaultDesc))) *szDefaultDesc = 0; - /* Try to load the topics from INI file */ - if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath)) + /* Try to load the resources from INI file */ + if (*lpResPath && LoadLocalizedResourcesFromINI(LOCALE_USER_DEFAULT, lpResPath)) return TRUE; /* We failed, fall back to internal (localized) resource */ @@ -381,7 +385,7 @@ } static VOID -FreeTopics(VOID) +FreeResources(VOID) { if (!pTopics) return; @@ -421,8 +425,8 @@ /* Verify that the file exists, otherwise use the default configuration */ if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) { - /* Use the default configuration and retrieve the default topics */ - return LoadTopics(TEXT("")); + /* Use the default configuration and retrieve the default resources */ + return LoadLocalizedResources(TEXT("")); } /* Load the settings from the INI configuration file */ @@ -435,9 +439,9 @@ *szResPath = 0; } - /* Set the current directory to the one of this application, and retrieve the topics */ + /* Set the current directory to the one of this application, and retrieve the resources */ SetCurrentDirectory(szAppPath); - return LoadTopics(szResPath); + return LoadLocalizedResources(szResPath); } #if 0 @@ -556,10 +560,7 @@ rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) - StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); - - /* Load the configuration and the topics */ + /* Load the configuration and the resources */ LoadConfiguration(); /* Create main window */ @@ -592,7 +593,7 @@ } /* Cleanup */ - FreeTopics(); + FreeResources(); return msg.wParam; }

1 0

[hbelusca] 73657: Port commit r73656 : welcome.ini configuration.
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 03:16:08 2017 New Revision: 73657 URL: http://svn.reactos.org/svn/reactos?rev=73657&view=rev Log: Port commit r73656 : welcome.ini configuration. Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/ - copied from r73656, trunk/reactos/boot/bootdata/welcome_config/ Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ (props changed) branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt branches/ReactOS-0.4.4-FOSDEM2017/rosapps/ (props changed) Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 1 03:16:08 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654 +/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654,73656 Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Feb 1 03:16:08 2017 @@ -71,8 +71,7 @@ HWND hWndCloseButton = NULL; HWND hWndCheckButton = NULL; -/* TODO: Retrieve the preferences from a configuration file */ -BOOL bDisplayCheckBox = FALSE; // FIXME! +BOOL bDisplayCheckBox = FALSE; // FIXME: We should also repaint the OS version correctly! BOOL bDisplayExitBtn = TRUE; #define BUFFER_SIZE 1024 @@ -121,7 +120,7 @@ /* FUNCTIONS ****************************************************************/ -INT GetLocaleName(LCID Locale, LPTSTR lpLCData, SIZE_T cchData) +INT GetLocaleName(IN LCID Locale, OUT LPTSTR lpLCData, IN SIZE_T cchData) { INT ret, ret2; @@ -197,7 +196,8 @@ } } -BOOL LoadTopicsFromINI(LCID Locale) +static BOOL +LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath) { DWORD dwRet; DWORD dwSize; @@ -215,7 +215,7 @@ } /* Build the INI file name */ - GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath); + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), lpResPath); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\")); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini")); @@ -225,7 +225,7 @@ { StringCchCopy(szBuffer, ARRAYSIZE(szBuffer), TEXT("en-US")); - GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath); + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), lpResPath); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\")); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini")); @@ -324,7 +324,8 @@ return TRUE; } -BOOL LoadTopics(VOID) +static BOOL +LoadTopics(LPTSTR lpResPath) { #define MAX_NUMBER_INTERNAL_TOPICS 3 @@ -344,7 +345,7 @@ *szDefaultDesc = 0; /* Try to load the topics from INI file */ - if (LoadTopicsFromINI(LOCALE_USER_DEFAULT)) + if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath)) return TRUE; /* We failed, fall back to internal (localized) resource */ @@ -379,7 +380,8 @@ return TRUE; } -VOID FreeTopics(VOID) +static VOID +FreeTopics(VOID) { if (!pTopics) return; @@ -392,6 +394,50 @@ HeapFree(GetProcessHeap(), 0, pTopics); pTopics = NULL; dwNumberTopics = 0; +} + +static BOOL +LoadConfiguration(VOID) +{ + TCHAR szAppPath[MAX_PATH]; + TCHAR szIniPath[MAX_PATH]; + TCHAR szResPath[MAX_PATH]; + + /* Retrieve the full path to this application */ + GetModuleFileName(NULL, szAppPath, ARRAYSIZE(szAppPath)); + if (*szAppPath) + { + LPTSTR lpFileName = _tcsrchr(szAppPath, _T('\\')); + if (lpFileName) + *lpFileName = 0; + else + *szAppPath = 0; + } + + /* Build the full INI file path name */ + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), szAppPath); + StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\welcome.ini")); + + /* Verify that the file exists, otherwise use the default configuration */ + if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) + { + /* Use the default configuration and retrieve the default topics */ + return LoadTopics(TEXT("")); + } + + /* Load the settings from the INI configuration file */ + bDisplayCheckBox = !!GetPrivateProfileInt(TEXT("Welcome"), TEXT("DisplayCheckBox"), FALSE /* default */, szIniPath); + bDisplayExitBtn = !!GetPrivateProfileInt(TEXT("Welcome"), TEXT("DisplayExitButton"), TRUE /* default */, szIniPath); + + if (!GetPrivateProfileString(TEXT("Welcome"), TEXT("ResourceDir"), NULL /* default */, + szResPath, ARRAYSIZE(szResPath), szIniPath)) + { + *szResPath = 0; + } + + /* Set the current directory to the one of this application, and retrieve the topics */ + SetCurrentDirectory(szAppPath); + return LoadTopics(szResPath); } #if 0 @@ -513,7 +559,8 @@ if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); - LoadTopics(); + /* Load the configuration and the topics */ + LoadConfiguration(); /* Create main window */ hWndMain = CreateWindow(szFrameClass, @@ -544,6 +591,7 @@ DispatchMessage(&msg); } + /* Cleanup */ FreeTopics(); return msg.wParam; Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto… ============================================================================== --- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Wed Feb 1 03:16:08 2017 @@ -1,7 +1,7 @@ add_subdirectory(packages) -#common hives +# Common hives add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) @@ -14,31 +14,51 @@ hivebcd.inf) -#regtest +# Regtest add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) -#autorun.inf +# autorun.inf add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-bootcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR bootcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-livecd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR livecd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-hybridcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR hybridcd) -#icon.ico +# icon.ico add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd) -#readme.txt +# readme.txt add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION reactos FOR all) -#freeldr.ini +# Welcome.exe optional custom configuration (only for HybridCD) +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/) + # Copy the main configuration file + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION bootcd/reactos NO_CAB FOR hybridcd) + + # Convert the translation files (name format: xx-YY.ini) into UTF-16 + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/welcome_config) + file(GLOB I18N_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/ ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/*-*.ini) + foreach(_file ${I18N_FILES}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/welcome_config/${_file}) + set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/${_file}) + add_custom_command(OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" + DEPENDS native-utf16le "${_source_file}") + add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION bootcd/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) + list(APPEND _converted_welcome_i18n_files ${_converted_file}) + endforeach(_file) + add_custom_target(converted_welcome_i18n_files DEPENDS ${_converted_welcome_i18n_files}) +endif() + +# freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR livecd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR hybridcd) -#unattend +# Unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) -#LiveCD shortcuts +# LiveCD shortcuts macro(add_livecd_shortcut name app dest) add_link(NAME ${name} CMD_LINE_ARGS ${app} ICON ${app} PATH livecd_start.cmd GUID "{450D8FBA-AD25-11D0-98A8-0800361B1103}" MINIMIZE) list(APPEND LIVECD_SHORTCUTS "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk") Propchange: branches/ReactOS-0.4.4-FOSDEM2017/rosapps/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 1 03:16:08 2017 @@ -1,2 +1,2 @@ /branches/colins-printing-for-freedom/rosapps:67543-68405,68407-68414,68417-70595 -/trunk/rosapps:73522-73645 +/trunk/rosapps:73522-73654

1 0

[hbelusca] 73656: [WELCOME]: Follow-up to r73590: Load a "welcome.ini" configuration file inside the path of the welcome.exe application, if present, that specifies few default values to use for th...
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 03:12:56 2017 New Revision: 73656 URL: http://svn.reactos.org/svn/reactos?rev=73656&view=rev Log: [WELCOME]: Follow-up to r73590: Load a "welcome.ini" configuration file inside the path of the welcome.exe application, if present, that specifies few default values to use for the interface, as well as the path (possibly relative) to a subdirectory containing ini files specifying localized resources for the interface. [BOOTDATA]: Add a default "welcome.ini" file to the build, only for hybrid-cds. The ini files containing the localized resources are automatically converted to UTF-16 prior to inclusion in the hybridcd. Added: trunk/reactos/boot/bootdata/welcome_config/ trunk/reactos/boot/bootdata/welcome_config/welcome.ini (with props) Modified: trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Feb 1 03:12:56 2017 @@ -71,8 +71,7 @@ HWND hWndCloseButton = NULL; HWND hWndCheckButton = NULL; -/* TODO: Retrieve the preferences from a configuration file */ -BOOL bDisplayCheckBox = FALSE; // FIXME! +BOOL bDisplayCheckBox = FALSE; // FIXME: We should also repaint the OS version correctly! BOOL bDisplayExitBtn = TRUE; #define BUFFER_SIZE 1024 @@ -121,7 +120,7 @@ /* FUNCTIONS ****************************************************************/ -INT GetLocaleName(LCID Locale, LPTSTR lpLCData, SIZE_T cchData) +INT GetLocaleName(IN LCID Locale, OUT LPTSTR lpLCData, IN SIZE_T cchData) { INT ret, ret2; @@ -197,7 +196,8 @@ } } -BOOL LoadTopicsFromINI(LCID Locale) +static BOOL +LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath) { DWORD dwRet; DWORD dwSize; @@ -215,7 +215,7 @@ } /* Build the INI file name */ - GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath); + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), lpResPath); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\")); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini")); @@ -225,7 +225,7 @@ { StringCchCopy(szBuffer, ARRAYSIZE(szBuffer), TEXT("en-US")); - GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath); + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), lpResPath); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\")); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer); StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini")); @@ -324,7 +324,8 @@ return TRUE; } -BOOL LoadTopics(VOID) +static BOOL +LoadTopics(LPTSTR lpResPath) { #define MAX_NUMBER_INTERNAL_TOPICS 3 @@ -344,7 +345,7 @@ *szDefaultDesc = 0; /* Try to load the topics from INI file */ - if (LoadTopicsFromINI(LOCALE_USER_DEFAULT)) + if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath)) return TRUE; /* We failed, fall back to internal (localized) resource */ @@ -379,7 +380,8 @@ return TRUE; } -VOID FreeTopics(VOID) +static VOID +FreeTopics(VOID) { if (!pTopics) return; @@ -392,6 +394,50 @@ HeapFree(GetProcessHeap(), 0, pTopics); pTopics = NULL; dwNumberTopics = 0; +} + +static BOOL +LoadConfiguration(VOID) +{ + TCHAR szAppPath[MAX_PATH]; + TCHAR szIniPath[MAX_PATH]; + TCHAR szResPath[MAX_PATH]; + + /* Retrieve the full path to this application */ + GetModuleFileName(NULL, szAppPath, ARRAYSIZE(szAppPath)); + if (*szAppPath) + { + LPTSTR lpFileName = _tcsrchr(szAppPath, _T('\\')); + if (lpFileName) + *lpFileName = 0; + else + *szAppPath = 0; + } + + /* Build the full INI file path name */ + StringCchCopy(szIniPath, ARRAYSIZE(szIniPath), szAppPath); + StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\welcome.ini")); + + /* Verify that the file exists, otherwise use the default configuration */ + if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) + { + /* Use the default configuration and retrieve the default topics */ + return LoadTopics(TEXT("")); + } + + /* Load the settings from the INI configuration file */ + bDisplayCheckBox = !!GetPrivateProfileInt(TEXT("Welcome"), TEXT("DisplayCheckBox"), FALSE /* default */, szIniPath); + bDisplayExitBtn = !!GetPrivateProfileInt(TEXT("Welcome"), TEXT("DisplayExitButton"), TRUE /* default */, szIniPath); + + if (!GetPrivateProfileString(TEXT("Welcome"), TEXT("ResourceDir"), NULL /* default */, + szResPath, ARRAYSIZE(szResPath), szIniPath)) + { + *szResPath = 0; + } + + /* Set the current directory to the one of this application, and retrieve the topics */ + SetCurrentDirectory(szAppPath); + return LoadTopics(szResPath); } #if 0 @@ -513,7 +559,8 @@ if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle))) StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome")); - LoadTopics(); + /* Load the configuration and the topics */ + LoadConfiguration(); /* Create main window */ hWndMain = CreateWindow(szFrameClass, @@ -544,6 +591,7 @@ DispatchMessage(&msg); } + /* Cleanup */ FreeTopics(); return msg.wParam; Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Wed Feb 1 03:12:56 2017 @@ -1,7 +1,7 @@ add_subdirectory(packages) -#common hives +# Common hives add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) @@ -14,31 +14,51 @@ hivebcd.inf) -#regtest +# Regtest add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) -#autorun.inf +# autorun.inf add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-bootcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR bootcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-livecd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR livecd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-hybridcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR hybridcd) -#icon.ico +# icon.ico add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd) -#readme.txt +# readme.txt add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION reactos FOR all) -#freeldr.ini +# Welcome.exe optional custom configuration (only for HybridCD) +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/) + # Copy the main configuration file + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION bootcd/reactos NO_CAB FOR hybridcd) + + # Convert the translation files (name format: xx-YY.ini) into UTF-16 + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/welcome_config) + file(GLOB I18N_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/ ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/*-*.ini) + foreach(_file ${I18N_FILES}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/welcome_config/${_file}) + set(_source_file ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/${_file}) + add_custom_command(OUTPUT "${_converted_file}" + COMMAND native-utf16le "${_source_file}" "${_converted_file}" + DEPENDS native-utf16le "${_source_file}") + add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION bootcd/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) + list(APPEND _converted_welcome_i18n_files ${_converted_file}) + endforeach(_file) + add_custom_target(converted_welcome_i18n_files DEPENDS ${_converted_welcome_i18n_files}) +endif() + +# freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR bootcd regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NOT_IN_HYBRIDCD NAME_ON_CD freeldr.ini FOR livecd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR hybridcd) -#unattend +# Unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) -#LiveCD shortcuts +# LiveCD shortcuts macro(add_livecd_shortcut name app dest) add_link(NAME ${name} CMD_LINE_ARGS ${app} ICON ${app} PATH livecd_start.cmd GUID "{450D8FBA-AD25-11D0-98A8-0800361B1103}" MINIMIZE) list(APPEND LIVECD_SHORTCUTS "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk") Added: trunk/reactos/boot/bootdata/welcome_config/welcome.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/welcome_conf… ============================================================================== --- trunk/reactos/boot/bootdata/welcome_config/welcome.ini (added) +++ trunk/reactos/boot/bootdata/welcome_config/welcome.ini [iso-8859-1] Wed Feb 1 03:12:56 2017 @@ -0,0 +1,5 @@ + +[Welcome] +DisplayCheckBox = 0 +DisplayExitButton = 1 +ResourceDir = welcome\ Propchange: trunk/reactos/boot/bootdata/welcome_config/welcome.ini ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 73655: Port commit r73654 "Fix the dependencies for the hybridcd".
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 02:20:46 2017 New Revision: 73655 URL: http://svn.reactos.org/svn/reactos?rev=73655&view=rev Log: Port commit r73654 "Fix the dependencies for the hybridcd". Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ (props changed) branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 1 02:20:46 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643 +/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654 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] Wed Feb 1 02:20:46 2017 @@ -290,49 +290,49 @@ message(FATAL_ERROR "You must provide a cd name (or \"all\" for all of them) to install the file on!") endif() - #get file if we need to + # get file if we need to if(NOT _CD_FILE) get_target_property(_CD_FILE ${_CD_TARGET} LOCATION_${CMAKE_BUILD_TYPE}) endif() - #do we add it to all CDs? + # do we add it to all CDs? list(FIND _CD_FOR all __cd) if(NOT __cd EQUAL -1) list(REMOVE_AT _CD_FOR __cd) list(INSERT _CD_FOR __cd "bootcd;livecd;regtest") endif() - #do we add it to bootcd? + # do we add it to bootcd? list(FIND _CD_FOR bootcd __cd) if(NOT __cd EQUAL -1) - #whether or not we should put it in reactos.cab or directly on cd + # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - #directly on cd + # directly on cd foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - #add it also into the hybridcd if not specified otherwise + # add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "setup/${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() + # manage dependency if(_CD_TARGET) - #manage dependency add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() - #add it in reactos.cab + # add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") unset(__relative_file) + # manage dependency - target level if(_CD_TARGET) - #manage dependency - target level add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() # manage dependency - file level @@ -340,34 +340,38 @@ endif() endif() #end bootcd - #do we add it to livecd? + # do we add it to livecd? list(FIND _CD_FOR livecd __cd) if(NOT __cd EQUAL -1) - #manage dependency + # manage dependency if(_CD_TARGET) add_dependencies(livecd ${_CD_TARGET} registry_inf) endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - #add it also into the hybridcd if not specified otherwise + # add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() endif() #end livecd - #do we need also to add it to hybridcd? + # do we need also to add it to hybridcd? list(FIND _CD_FOR hybridcd __cd) if(NOT __cd EQUAL -1) + # manage dependency + if(_CD_TARGET) + add_dependencies(hybridcd ${_CD_TARGET}) + endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) @@ -376,23 +380,23 @@ endforeach() endif() #end hybridcd - #do we add it to regtest? + # do we add it to regtest? list(FIND _CD_FOR regtest __cd) if(NOT __cd EQUAL -1) - #whether or not we should put it in reactos.cab or directly on cd + # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - #directly on cd + # directly on cd foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endforeach() + # manage dependency if(_CD_TARGET) - #manage dependency add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) endif() else()

1 0

[hbelusca] 73654: [CMAKE]: Fix the dependencies for the hybridcd.
by hbelusca＠svn.reactos.org 01 Feb '17

01 Feb '17

Author: hbelusca Date: Wed Feb 1 02:18:30 2017 New Revision: 73654 URL: http://svn.reactos.org/svn/reactos?rev=73654&view=rev Log: [CMAKE]: Fix the dependencies for the hybridcd. Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Wed Feb 1 02:18:30 2017 @@ -290,49 +290,49 @@ message(FATAL_ERROR "You must provide a cd name (or \"all\" for all of them) to install the file on!") endif() - #get file if we need to + # get file if we need to if(NOT _CD_FILE) get_target_property(_CD_FILE ${_CD_TARGET} LOCATION_${CMAKE_BUILD_TYPE}) endif() - #do we add it to all CDs? + # do we add it to all CDs? list(FIND _CD_FOR all __cd) if(NOT __cd EQUAL -1) list(REMOVE_AT _CD_FOR __cd) list(INSERT _CD_FOR __cd "bootcd;livecd;regtest") endif() - #do we add it to bootcd? + # do we add it to bootcd? list(FIND _CD_FOR bootcd __cd) if(NOT __cd EQUAL -1) - #whether or not we should put it in reactos.cab or directly on cd + # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - #directly on cd + # directly on cd foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - #add it also into the hybridcd if not specified otherwise + # 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}") endif() endforeach() + # manage dependency if(_CD_TARGET) - #manage dependency add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() - #add it in reactos.cab + # add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") unset(__relative_file) + # manage dependency - target level if(_CD_TARGET) - #manage dependency - target level add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() # manage dependency - file level @@ -340,34 +340,38 @@ endif() endif() #end bootcd - #do we add it to livecd? + # do we add it to livecd? list(FIND _CD_FOR livecd __cd) if(NOT __cd EQUAL -1) - #manage dependency + # manage dependency if(_CD_TARGET) add_dependencies(livecd ${_CD_TARGET} registry_inf) endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") - #add it also into the hybridcd if not specified otherwise + # 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}") endif() endforeach() endif() #end livecd - #do we need also to add it to hybridcd? + # do we need also to add it to hybridcd? list(FIND _CD_FOR hybridcd __cd) if(NOT __cd EQUAL -1) + # manage dependency + if(_CD_TARGET) + add_dependencies(hybridcd ${_CD_TARGET}) + endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) @@ -376,23 +380,23 @@ endforeach() endif() #end hybridcd - #do we add it to regtest? + # do we add it to regtest? list(FIND _CD_FOR regtest __cd) if(NOT __cd EQUAL -1) - #whether or not we should put it in reactos.cab or directly on cd + # whether or not we should put it in reactos.cab or directly on cd if(_CD_NO_CAB) - #directly on cd + # directly on cd foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) - #rename it in the cd tree + # rename it in the cd tree set(__file ${_CD_NAME_ON_CD}) else() get_filename_component(__file ${item} NAME) endif() set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endforeach() + # manage dependency if(_CD_TARGET) - #manage dependency add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) endif() else()

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