date:20171105

[ros-diffs] [reactos] 01/01: [RAPPS-DB] CORE-13965 downgrade to Miranda IM 0.10.21, because Miranda IM 0.10.48 link is down and app was non-working before, dreimer gave ok to groom DB a bit

2017-11-05 Thread Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=516442544a28e09ea7c2385b2812a7ee1f65e291

commit 516442544a28e09ea7c2385b2812a7ee1f65e291
Author: Joachim Henze 
AuthorDate: Mon Nov 6 01:56:48 2017 +0100

[RAPPS-DB] CORE-13965 downgrade to Miranda IM 0.10.21, because Miranda IM 
0.10.48 link is down and app was non-working before, dreimer gave ok to groom 
DB a bit
---
 media/rapps/mirandaim.txt | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/media/rapps/mirandaim.txt b/media/rapps/mirandaim.txt
index 8cdeb7e8b8..0458aafed8 100644
--- a/media/rapps/mirandaim.txt
+++ b/media/rapps/mirandaim.txt
@@ -1,25 +1,25 @@
 [Section]
 Name = Miranda IM
-Version = 0.10.48
+Version = 0.10.21
 License = GPL
 Description = Open source multiprotocol instant messaging application. May not 
work completely.
-Size = 7.6 MiB
+Size = 2.8 MiB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = 
http://download.sourceforge.net/project/miranda/miranda-im/0.10.48.0/miranda-im-v0.10.48-unicode.exe?nowrap
-SHA1 = 318b9283adf73d1ec92990c72296bb3882110c0c
+URLDownload = 
https://web.archive.org/web/20140327190905/http://files.miranda-im.org/stable/0.10.21.0/miranda-im-v0.10.21-unicode.exe
+SHA1 = 8b76ecba6e54abe99cc52b2f7c3c27726befaf0c
 CDPath = none
 
 [Section.0407]
 Description = Quelloffene Multiprotokoll Instant Messaging Anwendung. 
Funktioniert möglicherweise nicht vollständig.
-Size = 7,6 MiB
+Size = 2,8 MiB
 
 [Section.0a]
 Description = Aplicación de mensajería instantánea multiprotocolo de código 
abierto. Puede que no funcione del todo bien.
 
 [Section.040c]
 Description = Application de messagerie instantannée multi-protocoles open 
source - pourrait ne pas fonctionner complètement.
-Size = 7,6 Mio
+Size = 2,8 Mio
 
 [Section.0410]
 Description = Multi-protocollo open source per applicazioni di messaggistica 
istantanea - potrebbe non funzionare del tutto.
@@ -32,15 +32,15 @@ Description = Otwarty komunikator internetowy, obsługujący 
wiele różnych pro
 
 [Section.0418]
 Description = Aplicație de mesagerie instant multiprotocol (cu surse 
deschise). Este posibil să întâmpinați limitări de funcționalitate.
-Size = 7,6 Mio
+Size = 2,8 Mio
 
 [Section.0419]
 Description = Мультипротокольное приложение для обмена мгновенными сообщениями 
с открытым исходным кодом.
-Size = 7,6 МиБ
+Size = 2,8 МиБ
 
 [Section.041f]
 Description = Açık kaynak, çoklu iletişim kâideli, evgin iletileşme 
uygulaması. Eksiksiz olarak çalışmayabilir.
-Size = 7,6 MiB
+Size = 2,8 MiB
 
 [Section.0422]
 Description = Відкрита мультипротокольна програма миттєвих повідомлень - може 
не працювати повністю.

[ros-diffs] [reactos] 01/01: [RAPPS] Reflect installation status it download dialog header.

2017-11-05 Thread Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47bbd637d8d0b8d012e4071b3bdae83d938267d8

commit 47bbd637d8d0b8d012e4071b3bdae83d938267d8
Author: Alexander Shaposhnikov 
AuthorDate: Sun Nov 5 20:44:27 2017 +0200

[RAPPS] Reflect installation status it download dialog header.

Pointed out by Mark Jansen
---
 base/applications/rapps/loaddlg.cpp | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/base/applications/rapps/loaddlg.cpp 
b/base/applications/rapps/loaddlg.cpp
index 166b38304c..0d3d554fae 100644
--- a/base/applications/rapps/loaddlg.cpp
+++ b/base/applications/rapps/loaddlg.cpp
@@ -804,7 +804,13 @@ run:
 
 if (ShellExecuteExW())
 {
+//reflect installation progress in the titlebar
+//TODO: make a separate string with a placeholder to include 
app name?
+ATL::CStringW szMsgText = 
LoadStatusString(DLSTATUS_INSTALLING);
+SetWindowTextW(hDlg, szMsgText.GetString());
+
 DownloadsListView.SetDownloadStatus(iAppId, 
DLSTATUS_INSTALLING);
+
 //TODO: issue an install operation separately so that the apps 
could be downloaded in the background
 WaitForSingleObject(shExInfo.hProcess, INFINITE);
 CloseHandle(shExInfo.hProcess);

[ros-diffs] [reactos] 01/01: [SETUPAPI]: CM_Open_DevNode_Key_Ex: FIXME/ERR --> TRACE

2017-11-05 Thread Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a372398a68c062fe31e8fe72924145209246de

commit a2a372398a68c062fe31e8fe72924145209246de
Author: Eric Kohl 
AuthorDate: Sun Nov 5 17:55:25 2017 +0100

[SETUPAPI]: CM_Open_DevNode_Key_Ex: FIXME/ERR --> TRACE
---
 dll/win32/setupapi/cfgmgr.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c
index 80b535c3da..898b755ec3 100644
--- a/dll/win32/setupapi/cfgmgr.c
+++ b/dll/win32/setupapi/cfgmgr.c
@@ -5242,7 +5242,7 @@ CM_Open_DevNode_Key_Ex(
 HKEY hRootKey = NULL;
 CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED;
 
-FIXME("CM_Open_DevNode_Key_Ex(%lx %lx %lu %lx %p %lx %lx)\n",
+TRACE("CM_Open_DevNode_Key_Ex(%lx %lx %lu %lx %p %lx %lx)\n",
   dnDevNode, samDesired, ulHardwareProfile, Disposition, phkDevice, 
ulFlags, hMachine);
 
 if (phkDevice == NULL)
@@ -5304,13 +5304,13 @@ CM_Open_DevNode_Key_Ex(
 if (ret != CR_SUCCESS)
 goto done;
 
-ERR("pszKeyPath: %S\n", pszKeyPath);
-ERR("pszInstancePath: %S\n", pszInstancePath);
+TRACE("pszKeyPath: %S\n", pszKeyPath);
+TRACE("pszInstancePath: %S\n", pszInstancePath);
 
 wcscat(pszKeyPath, L"\\");
 wcscat(pszKeyPath, pszInstancePath);
 
-ERR("pszKeyPath: %S\n", pszKeyPath);
+TRACE("pszKeyPath: %S\n", pszKeyPath);
 
 if (hMachine == NULL)
 {

[ros-diffs] [reactos] 01/01: [SETUPAPI] GetDeviceInstanceKeyPath: Fix temporary buffer allocation, add missing code paths and fix registry paths. This should fix parts of CORE-13944.

2017-11-05 Thread Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d57b0ef91e32e9ab160ade36cb1f8003fd810702

commit d57b0ef91e32e9ab160ade36cb1f8003fd810702
Author: Eric Kohl 
AuthorDate: Sun Nov 5 17:31:34 2017 +0100

[SETUPAPI] GetDeviceInstanceKeyPath: Fix temporary buffer allocation, add 
missing code paths and fix registry paths.
This should fix parts of CORE-13944.
---
 dll/win32/setupapi/cfgmgr.c | 46 ++---
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c
index ef7ba947c7..80b535c3da 100644
--- a/dll/win32/setupapi/cfgmgr.c
+++ b/dll/win32/setupapi/cfgmgr.c
@@ -213,6 +213,14 @@ GetDeviceInstanceKeyPath(
 
 TRACE("GetDeviceInstanceKeyPath()\n");
 
+/* Allocate a buffer for the device id */
+pszBuffer = MyMalloc(300 * sizeof(WCHAR));
+if (pszBuffer == NULL)
+{
+ERR("MyMalloc() failed\n");
+return CR_OUT_OF_MEMORY;
+}
+
 if (ulFlags & CM_REGISTRY_SOFTWARE)
 {
 /* Software Key Path */
@@ -229,7 +237,7 @@ GetDeviceInstanceKeyPath(
   L"%s\\%s\\%s\\%s",
   L"System\\CurrentControlSet\\Hardware Profiles",
   L"Current",
-  L"System\\CurrentControlSet\\Control\\Enum",
+  L"System\\CurrentControlSet\\Enum",
   pszBuffer);
 }
 else
@@ -238,13 +246,30 @@ GetDeviceInstanceKeyPath(
   L"%s\\%04lu\\%s\\%s",
   L"System\\CurrentControlSet\\Hardware Profiles",
   ulHardwareProfile,
-  L"System\\CurrentControlSet\\Control\\Enum",
+  L"System\\CurrentControlSet\\Enum",
   pszBuffer);
 }
 }
+else if (ulFlags & CM_REGISTRY_USER)
+{
+wsprintfW(pszKeyPath,
+  L"%s\\%s",
+  L"System\\CurrentControlSet\\Enum",
+  pszDeviceInst);
+
+wcscpy(pszInstancePath,
+   L"Device Parameters");
+}
 else
 {
-ret = CR_CALL_NOT_IMPLEMENTED;
+SplitDeviceInstanceId(pszDeviceInst,
+  pszBuffer,
+  pszInstancePath);
+
+wsprintfW(pszKeyPath,
+  L"%s\\%s",
+  L"System\\CurrentControlSet\\Enum",
+  pszBuffer);
 }
 }
 else
@@ -253,15 +278,6 @@ GetDeviceInstanceKeyPath(
 
 ulTransferLength = 300 * sizeof(WCHAR);
 ulLength = 300 * sizeof(WCHAR);
-
-pszBuffer = MyMalloc(ulTransferLength);
-if (pszBuffer == NULL)
-{
-ERR("MyMalloc() failed\n");
-ret = CR_OUT_OF_MEMORY;
-goto done;
-}
-
 ret = PNP_GetDeviceRegProp(BindingHandle,
pszDeviceInst,
CM_DRP_DRIVER,
@@ -5288,13 +5304,13 @@ CM_Open_DevNode_Key_Ex(
 if (ret != CR_SUCCESS)
 goto done;
 
-TRACE("pszKeyPath: %S\n", pszKeyPath);
-TRACE("pszInstancePath: %S\n", pszInstancePath);
+ERR("pszKeyPath: %S\n", pszKeyPath);
+ERR("pszInstancePath: %S\n", pszInstancePath);
 
 wcscat(pszKeyPath, L"\\");
 wcscat(pszKeyPath, pszInstancePath);
 
-TRACE("pszKeyPath: %S\n", pszKeyPath);
+ERR("pszKeyPath: %S\n", pszKeyPath);
 
 if (hMachine == NULL)
 {

[ros-diffs] [reactos] 02/02: [CDFS] Set the FO_CLEANUP_COMPLETE on cleanup

2017-11-05 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f65b294f21549e7331c6117372d245d45317417e

commit f65b294f21549e7331c6117372d245d45317417e
Author: Pierre Schweitzer 
AuthorDate: Sun Nov 5 13:47:58 2017 +0100

[CDFS] Set the FO_CLEANUP_COMPLETE on cleanup
---
 drivers/filesystems/cdfs/cleanup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/filesystems/cdfs/cleanup.c 
b/drivers/filesystems/cdfs/cleanup.c
index 10d7704636..63ae24f7d9 100644
--- a/drivers/filesystems/cdfs/cleanup.c
+++ b/drivers/filesystems/cdfs/cleanup.c
@@ -77,6 +77,9 @@ CdfsCleanupFile(PCDFS_IRP_CONTEXT IrpContext,
 CcUninitializeCacheMap (FileObject, NULL, NULL);
 }
 
+/* Inform cleanup is complete */
+FileObject->Flags |= FO_CLEANUP_COMPLETE;
+
 return STATUS_SUCCESS;
 }

[ros-diffs] [reactos] 01/02: [CDFS] Don't allow FS opening when volume is locked

2017-11-05 Thread Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=244b4f99b384c921a16e5b39e9a0af608c263ad8

commit 244b4f99b384c921a16e5b39e9a0af608c263ad8
Author: Pierre Schweitzer 
AuthorDate: Sun Nov 5 10:59:49 2017 +0100

[CDFS] Don't allow FS opening when volume is locked
---
 drivers/filesystems/cdfs/create.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/filesystems/cdfs/create.c 
b/drivers/filesystems/cdfs/create.c
index dde7a2404d..704a4cfc91 100644
--- a/drivers/filesystems/cdfs/create.c
+++ b/drivers/filesystems/cdfs/create.c
@@ -222,11 +222,6 @@ CdfsCreateFile(PDEVICE_OBJECT DeviceObject,
 return STATUS_ACCESS_DENIED;
 }
 
-if (BooleanFlagOn(DeviceExt->Flags, VCB_VOLUME_LOCKED))
-{
-return STATUS_ACCESS_DENIED;
-}
-
 Status = CdfsOpenFile(DeviceExt,
 FileObject,
 >FileName);
@@ -274,6 +269,11 @@ CdfsCreate(
 
 DeviceObject = IrpContext->DeviceObject;
 DeviceExt = DeviceObject->DeviceExtension;
+if (BooleanFlagOn(DeviceExt->Flags, VCB_VOLUME_LOCKED))
+{
+return STATUS_ACCESS_DENIED;
+}
+
 if (DeviceObject == CdfsGlobalData->CdFsDeviceObject || DeviceObject == 
CdfsGlobalData->HddFsDeviceObject)
 {
 /* DeviceObject represents FileSystem instead of logical volume */

[ros-diffs] [reactos] 03/03: [BROWSEUI] CBandSiteMenu

2017-11-05 Thread Stas'M

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=484f33f0d3bcf339f0eb287cd9673459cd964897

commit 484f33f0d3bcf339f0eb287cd9673459cd964897
Author: Stas'M 
AuthorDate: Wed Nov 1 23:05:33 2017 +0300

[BROWSEUI] CBandSiteMenu

- Move SHGetFolder code to CreateBuiltInISFBand
- Get rid of CSIDL_FLAG_CREATE (Windows doesn't create Quick Launch
directory)
- Use ILFree since variables are reused now
---
 dll/win32/browseui/shellbars/CBandSiteMenu.cpp | 62 +++---
 dll/win32/browseui/shellbars/CBandSiteMenu.h   |  1 +
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp 
b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
index ea0f9cf9b6..0c56af463c 100644
--- a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
+++ b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
@@ -48,19 +48,6 @@ CBandSiteMenu::~CBandSiteMenu()
 
 HRESULT WINAPI CBandSiteMenu::FinalConstruct()
 {
-HRESULT hr = SHGetFolderLocation(0, CSIDL_DESKTOP, NULL, 0, 
_DesktopPidl);
-if (FAILED_UNEXPECTEDLY(hr))
-return hr;
-
-WCHAR buffer[MAX_PATH];
-hr = SHGetFolderPathAndSubDirW(0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 
0, L"Microsoft\\Internet Explorer\\Quick Launch", buffer);
-if (FAILED_UNEXPECTEDLY(hr))
-return hr;
-
-m_QLaunchPidl.Attach(ILCreateFromPathW(buffer));
-if (m_QLaunchPidl == NULL)
-return E_FAIL;
-
 return S_OK;
 }
 
@@ -150,12 +137,53 @@ HRESULT CBandSiteMenu::_CreateNewISFBand(HWND hwnd, 
REFIID riid, void** ppv)
 return pISFB->QueryInterface(riid, ppv);
 }
 
+LPITEMIDLIST CBandSiteMenu::_GetQLaunchPidl(BOOL refresh)
+{
+if (m_QLaunchPidl != NULL)
+{
+if (refresh)
+m_QLaunchPidl.Free();
+else
+return m_QLaunchPidl;
+}
+
+WCHAR buffer[MAX_PATH];
+HRESULT hr = SHGetFolderPathAndSubDirW(0, CSIDL_APPDATA, NULL, 0, 
L"Microsoft\\Internet Explorer\\Quick Launch", buffer);
+if (FAILED_UNEXPECTEDLY(hr))
+return NULL;
+
+m_QLaunchPidl.Attach(ILCreateFromPathW(buffer));
+return m_QLaunchPidl;
+}
+
 HRESULT CBandSiteMenu::_CreateBuiltInISFBand(UINT uID, REFIID riid, void** ppv)
 {
 LPITEMIDLIST pidl;
 HRESULT hr;
 
-pidl = (uID == IDM_TASKBAR_TOOLBARS_DESKTOP) ? m_DesktopPidl : 
m_QLaunchPidl;
+switch (uID)
+{
+case IDM_TASKBAR_TOOLBARS_DESKTOP:
+{
+if (m_DesktopPidl != NULL)
+m_DesktopPidl.Free();
+
+hr = SHGetFolderLocation(0, CSIDL_DESKTOP, NULL, 0, 
_DesktopPidl);
+if (FAILED_UNEXPECTEDLY(hr))
+return hr;
+
+pidl = m_DesktopPidl;
+break;
+}
+case IDM_TASKBAR_TOOLBARS_QUICKLAUNCH:
+{
+pidl = _GetQLaunchPidl(true);
+break;
+}
+}
+
+if (pidl == NULL)
+return E_FAIL;
 
 CComPtr pISFB;
 hr = CISFBand_CreateInstance(IID_IShellFolderBand, (PVOID*));
@@ -238,7 +266,11 @@ UINT CBandSiteMenu::_GetMenuIdFromISFBand(IUnknown *pBand)
 if (FAILED_UNEXPECTEDLY(hr))
 return UINT_MAX;
 
-hr = psfDesktop->CompareIDs(0, pidl, m_QLaunchPidl);
+LPITEMIDLIST _QLaunchPidl = _GetQLaunchPidl(false);
+if (_QLaunchPidl == NULL)
+return UINT_MAX;
+
+hr = psfDesktop->CompareIDs(0, pidl, _QLaunchPidl);
 if (FAILED_UNEXPECTEDLY(hr))
 return UINT_MAX;
 
diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.h 
b/dll/win32/browseui/shellbars/CBandSiteMenu.h
index 6a78ae7c54..4e56fa998f 100644
--- a/dll/win32/browseui/shellbars/CBandSiteMenu.h
+++ b/dll/win32/browseui/shellbars/CBandSiteMenu.h
@@ -36,6 +36,7 @@ class CBandSiteMenu :
 
 HRESULT _CreateMenuPart();
 HRESULT _CreateNewISFBand(HWND hwnd, REFIID riid, void** ppv);
+LPITEMIDLIST _GetQLaunchPidl(BOOL refresh);
 HRESULT _CreateBuiltInISFBand(UINT uID, REFIID riid, void** ppv);
 HRESULT _AddISFBandToMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, 
UINT idCmdLast, IUnknown* pBand, DWORD dwBandID, UINT *newMenuId);
 UINT _GetMenuIdFromISFBand(IUnknown *pBand);

[ros-diffs] [reactos] 02/03: [CMAKE] Quick Launch shortcuts for Live/Hybrid CD

2017-11-05 Thread Stas'M

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=275ab7ba2f9c347003ed7f50912ce7e37c365281

commit 275ab7ba2f9c347003ed7f50912ce7e37c365281
Author: Stas'M 
AuthorDate: Wed Nov 1 22:54:53 2017 +0300

[CMAKE] Quick Launch shortcuts for Live/Hybrid CD
---
 boot/CMakeLists.txt  | 2 ++
 boot/bootdata/CMakeLists.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 01219a9741..96d12baea4 100644
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -102,6 +102,7 @@ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst 
"Profiles/All Users/My Docume
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Start 
Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All 
Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default 
User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default 
User/Application Data/Microsoft/Internet Explorer/Quick 
Launch=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default 
User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default 
User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default 
User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
@@ -145,6 +146,7 @@ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst 
"livecd/Profiles/All Users/
 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/Application Data/Microsoft/Internet Explorer/Quick 
Launch=${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")
diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt
index 400a9ece12..6698791d4f 100644
--- a/boot/bootdata/CMakeLists.txt
+++ b/boot/bootdata/CMakeLists.txt
@@ -98,5 +98,7 @@ add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe 
"Profiles/All Users/Start Men
 add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start 
Menu/Programs/System Tools")
 add_livecd_shortcut("Task Manager" taskmgr.exe "Profiles/All Users/Start 
Menu/Programs/System Tools")
 add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/All Users/Start 
Menu/Programs")
+add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/Default 
User/Application Data/Microsoft/Internet Explorer/Quick Launch")
+add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/Default 
User/Application Data/Microsoft/Internet Explorer/Quick Launch")
 
 add_custom_target(livecd_links DEPENDS ${LIVECD_SHORTCUTS})

[ros-diffs] [reactos] 01/03: [SHORTCUTS.INF] Add shortcuts for Quick Launch

2017-11-05 Thread Stas'M

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce3d9e30ab5ef8afc2c1d10600f5814a57e29929

commit ce3d9e30ab5ef8afc2c1d10600f5814a57e29929
Author: Stas'M 
AuthorDate: Wed Nov 1 22:48:39 2017 +0300

[SHORTCUTS.INF] Add shortcuts for Quick Launch
---
 media/inf/shortcuts.inf | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf
index 9323ddf003..561e96f4f3 100644
--- a/media/inf/shortcuts.inf
+++ b/media/inf/shortcuts.inf
@@ -12,6 +12,7 @@ AccessibilityShortcuts=2, %ACCESSORIES%\%ACCESSIBILITY%
 EntertainmentShortcuts=2, %ACCESSORIES%\%ENTERTAINMENT%
 CommunicationsShortcuts=2, %ACCESSORIES%\%COMMUNICATIONS%
 GamesShortcuts=2, %GAMES%
+QuickLaunchShortcuts=26, Microsoft\Internet Explorer\Quick Launch
 
 [DesktopShortcuts]
 %SystemRoot%\readme.txt, %README_TITLE%, %README_DESC%
@@ -60,6 +61,11 @@ GamesShortcuts=2, %GAMES%
 %SystemRoot%\system32\winmine.exe, %WINMINE_TITLE%, %WINMINE_DESC%, 0
 %SystemRoot%\system32\spider.exe, %SPIDER_TITLE%, %SPIDER_DESC%, 0
 
+[QuickLaunchShortcuts]
+%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1, 
%HOMEDRIVE%%HOMEPATH%
+%SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0, 
%HOMEDRIVE%%HOMEPATH%
+%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE_SHORT%, %RAPPS_DESC%, 0
+
 
 ; STRINGS ---

[ros-diffs] [reactos] 01/01: [SETUPAPI] Update some more functions to the current coding style, add annotations and add function names to the TRACE calls.

2017-11-05 Thread Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9a339817247fa37c31fe35b31a3d7d0484939a1

commit d9a339817247fa37c31fe35b31a3d7d0484939a1
Author: Eric Kohl 
AuthorDate: Sun Nov 5 11:33:08 2017 +0100

[SETUPAPI] Update some more functions to the current coding style, add 
annotations and add function names to the TRACE calls.
---
 dll/win32/setupapi/cfgmgr.c | 231 +++-
 1 file changed, 163 insertions(+), 68 deletions(-)

diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c
index e67db054c9..ef7ba947c7 100644
--- a/dll/win32/setupapi/cfgmgr.c
+++ b/dll/win32/setupapi/cfgmgr.c
@@ -85,7 +85,11 @@ typedef struct _INTERNAL_RANGE_LIST
 #define RANGE_LIST_MAGIC 0x33445566
 
 
-static BOOL GuidToString(LPGUID Guid, LPWSTR String)
+static
+BOOL
+GuidToString(
+_In_ LPGUID Guid,
+_Out_ LPWSTR String)
 {
 LPWSTR lpString;
 
@@ -104,8 +108,10 @@ static BOOL GuidToString(LPGUID Guid, LPWSTR String)
 }
 
 
-static CONFIGRET
-RpcStatusToCmStatus(RPC_STATUS Status)
+static
+CONFIGRET
+RpcStatusToCmStatus(
+_In_ RPC_STATUS Status)
 {
 return CR_FAILURE;
 }
@@ -114,7 +120,7 @@ RpcStatusToCmStatus(RPC_STATUS Status)
 static
 ULONG
 GetRegistryPropertyType(
-ULONG ulProperty)
+_In_ ULONG ulProperty)
 {
 switch (ulProperty)
 {
@@ -683,11 +689,16 @@ CMP_WaitServicesAvailable(
 /***
  * CM_Add_Empty_Log_Conf [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Add_Empty_Log_Conf(
-PLOG_CONF plcLogConf, DEVINST dnDevInst, PRIORITY Priority,
-ULONG ulFlags)
+CONFIGRET
+WINAPI
+CM_Add_Empty_Log_Conf(
+_Out_ PLOG_CONF plcLogConf,
+_In_ DEVINST dnDevInst,
+_In_ PRIORITY Priority,
+_In_ ULONG ulFlags)
 {
-TRACE("%p %p %lu %lx\n", plcLogConf, dnDevInst, Priority, ulFlags);
+TRACE("CM_Add_Empty_Log_Conf(%p %p %lu %lx)\n",
+  plcLogConf, dnDevInst, Priority, ulFlags);
 return CM_Add_Empty_Log_Conf_Ex(plcLogConf, dnDevInst, Priority,
 ulFlags, NULL);
 }
@@ -696,9 +707,13 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf(
 /***
  * CM_Add_Empty_Log_Conf_Ex [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
-PLOG_CONF plcLogConf, DEVINST dnDevInst, PRIORITY Priority,
-ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET
+WINAPI CM_Add_Empty_Log_Conf_Ex(
+_Out_ PLOG_CONF plcLogConf,
+_In_ DEVINST dnDevInst,
+_In_ PRIORITY Priority,
+_In_ ULONG ulFlags,
+_In_opt_ HMACHINE hMachine)
 {
 RPC_BINDING_HANDLE BindingHandle = NULL;
 HSTRING_TABLE StringTable = NULL;
@@ -707,7 +722,7 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
 PLOG_CONF_INFO pLogConfInfo;
 CONFIGRET ret = CR_SUCCESS;
 
-FIXME("%p %p %lu %lx %p\n",
+FIXME("CM_Add_Empty_Log_Conf_Ex(%p %p %lu %lx %p)\n",
   plcLogConf, dnDevInst, Priority, ulFlags, hMachine);
 
 if (!pSetupIsUserAdmin())
@@ -783,10 +798,15 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex(
 /***
  * CM_Add_IDA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Add_IDA(
-DEVINST dnDevInst, PSTR pszID, ULONG ulFlags)
+CONFIGRET
+WINAPI
+CM_Add_IDA(
+_In_ DEVINST dnDevInst,
+_In_ PSTR pszID,
+_In_ ULONG ulFlags)
 {
-TRACE("%p %s %lx\n", dnDevInst, pszID, ulFlags);
+TRACE("CM_Add_IDA(%p %s %lx)\n",
+  dnDevInst, pszID, ulFlags);
 return CM_Add_ID_ExA(dnDevInst, pszID, ulFlags, NULL);
 }
 
@@ -794,10 +814,15 @@ CONFIGRET WINAPI CM_Add_IDA(
 /***
  * CM_Add_IDW [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Add_IDW(
-DEVINST dnDevInst, PWSTR pszID, ULONG ulFlags)
+CONFIGRET
+WINAPI
+CM_Add_IDW(
+_In_ DEVINST dnDevInst,
+_In_ PWSTR pszID,
+_In_ ULONG ulFlags)
 {
-TRACE("%p %s %lx\n", dnDevInst, debugstr_w(pszID), ulFlags);
+TRACE("CM_Add_IDW(%p %s %lx)\n",
+  dnDevInst, debugstr_w(pszID), ulFlags);
 return CM_Add_ID_ExW(dnDevInst, pszID, ulFlags, NULL);
 }
 
@@ -805,13 +830,19 @@ CONFIGRET WINAPI CM_Add_IDW(
 /***
  * CM_Add_ID_ExA [SETUPAPI.@]
  */
-CONFIGRET WINAPI CM_Add_ID_ExA(
-DEVINST dnDevInst, PSTR pszID, ULONG ulFlags, HMACHINE hMachine)
+CONFIGRET
+WINAPI
+CM_Add_ID_ExA(
+_In_ DEVINST dnDevInst,
+_In_ PSTR pszID,
+_In_ ULONG ulFlags,
+_In_opt_ HMACHINE hMachine)
 {
 PWSTR pszIDW;
 CONFIGRET ret;
 
-TRACE("%p %s %lx %p\n", dnDevInst, pszID, ulFlags, hMachine);
+TRACE("CM_Add_ID_ExA(%p %s %lx %p)\n",
+  dnDevInst, pszID, ulFlags, hMachine);
 
 if (pSetupCaptureAndConvertAnsiArg(pszID, ))
 return CR_INVALID_DATA;
@@ -827,15 +858,21 @@ CONFIGRET WINAPI CM_Add_ID_ExA(

[ros-diffs] [reactos] 01/01: [SHELL32] SHBrowseForFolderW: Fix creating directories in the desktop and in drives like C: CORE-13925

2017-11-05 Thread Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78b78d6e735a69f497c6277f6dfdb10d55505802

commit 78b78d6e735a69f497c6277f6dfdb10d55505802
Author: Giannis Adamopoulos 
AuthorDate: Sun Nov 5 12:09:42 2017 +0200

[SHELL32] SHBrowseForFolderW: Fix creating directories in the desktop and 
in drives like C: CORE-13925
---
 dll/win32/shell32/wine/brsfolder.c | 49 +-
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/dll/win32/shell32/wine/brsfolder.c 
b/dll/win32/shell32/wine/brsfolder.c
index 36608314e2..499e040ef3 100644
--- a/dll/win32/shell32/wine/brsfolder.c
+++ b/dll/win32/shell32/wine/brsfolder.c
@@ -748,35 +748,52 @@ static HRESULT BrsFolder_NewFolder(browse_info *info)
 HRESULT hr;
 int len;
 
-if(!info->pidlRet) {
-ERR("Make new folder button should be disabled\n");
-return E_FAIL;
-}
-
-/* Create new directory */
+#ifdef __REACTOS__
 hr = SHGetDesktopFolder();
 if(FAILED(hr))
 return hr;
-hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, 
_IShellFolder, (void**));
-IShellFolder_Release(desktop);
-if(FAILED(hr))
-return hr;
 
-#ifdef __REACTOS__
-hr = SHGetPathFromIDListW(info->pidlRet, path);
+if (info->pidlRet)
+{
+hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, 
_IShellFolder, (void**));
+IShellFolder_Release(desktop);
+if(FAILED(hr))
+return hr;
+
+hr = SHGetPathFromIDListW(info->pidlRet, path);
+}
+else
+{
+cur = desktop;
+hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 
SHGFP_TYPE_CURRENT, path);
+}
 if(FAILED(hr))
 return hr;
 
-len = strlenW(path);
-if(lenpidlRet, 0, 
_IShellFolder, (void**));
+IShellFolder_Release(desktop);
+if(FAILED(hr))
+return hr;
 
 hr = IShellFolder_QueryInterface(cur, _ISFHelper, (void**));
 if(FAILED(hr))

[ros-diffs] [reactos] 01/01: [SETUPAPI] GetDeviceInstanceKeyPath: Implement the CM_REGISTRY_SOFTWARE | CM_REGISTRY_CONFIG part.

2017-11-05 Thread Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e850d19bceb0a73147ee09c282adeb10850358a

commit 8e850d19bceb0a73147ee09c282adeb10850358a
Author: Eric Kohl 
AuthorDate: Sun Nov 5 09:39:44 2017 +0100

[SETUPAPI] GetDeviceInstanceKeyPath: Implement the CM_REGISTRY_SOFTWARE | 
CM_REGISTRY_CONFIG part.
---
 dll/win32/setupapi/cfgmgr.c | 31 ++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c
index 362d34e14e..e67db054c9 100644
--- a/dll/win32/setupapi/cfgmgr.c
+++ b/dll/win32/setupapi/cfgmgr.c
@@ -210,7 +210,36 @@ GetDeviceInstanceKeyPath(
 if (ulFlags & CM_REGISTRY_SOFTWARE)
 {
 /* Software Key Path */
-ret = CR_CALL_NOT_IMPLEMENTED;
+
+if (ulFlags & CM_REGISTRY_CONFIG)
+{
+SplitDeviceInstanceId(pszDeviceInst,
+  pszBuffer,
+  pszInstancePath);
+
+if (ulHardwareProfile == 0)
+{
+wsprintfW(pszKeyPath,
+  L"%s\\%s\\%s\\%s",
+  L"System\\CurrentControlSet\\Hardware Profiles",
+  L"Current",
+  L"System\\CurrentControlSet\\Control\\Enum",
+  pszBuffer);
+}
+else
+{
+wsprintfW(pszKeyPath,
+  L"%s\\%04lu\\%s\\%s",
+  L"System\\CurrentControlSet\\Hardware Profiles",
+  ulHardwareProfile,
+  L"System\\CurrentControlSet\\Control\\Enum",
+  pszBuffer);
+}
+}
+else
+{
+ret = CR_CALL_NOT_IMPLEMENTED;
+}
 }
 else
 {

[ros-diffs] [reactos] 01/01: [RAPPS-DB] CORE-13965 downgrade to Miranda IM 0.10.21, because Miranda IM 0.10.48 link is down and app was non-working before, dreimer gave ok to groom DB a bit

[ros-diffs] [reactos] 01/01: [RAPPS] Reflect installation status it download dialog header.

[ros-diffs] [reactos] 01/01: [SETUPAPI]: CM_Open_DevNode_Key_Ex: FIXME/ERR --> TRACE

[ros-diffs] [reactos] 01/01: [SETUPAPI] GetDeviceInstanceKeyPath: Fix temporary buffer allocation, add missing code paths and fix registry paths. This should fix parts of CORE-13944.

[ros-diffs] [reactos] 02/02: [CDFS] Set the FO_CLEANUP_COMPLETE on cleanup

[ros-diffs] [reactos] 01/02: [CDFS] Don't allow FS opening when volume is locked

[ros-diffs] [reactos] 03/03: [BROWSEUI] CBandSiteMenu

[ros-diffs] [reactos] 02/03: [CMAKE] Quick Launch shortcuts for Live/Hybrid CD

[ros-diffs] [reactos] 01/03: [SHORTCUTS.INF] Add shortcuts for Quick Launch

[ros-diffs] [reactos] 01/01: [SETUPAPI] Update some more functions to the current coding style, add annotations and add function names to the TRACE calls.

[ros-diffs] [reactos] 01/01: [SHELL32] SHBrowseForFolderW: Fix creating directories in the desktop and in drives like C: CORE-13925

[ros-diffs] [reactos] 01/01: [SETUPAPI] GetDeviceInstanceKeyPath: Implement the CM_REGISTRY_SOFTWARE | CM_REGISTRY_CONFIG part.

12 matches

Site Navigation

Mail list logo

Footer information