Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/09: [CDFS_NEW] Fix headers inclusion so that it can work on a *nix platform
by Pierre Schweitzer 06 Nov '17

06 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cbcb1badee213fdbadaa… commit 3cbcb1badee213fdbadaa2db99086d21a8775fe8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Nov 6 19:38:01 2017 +0100 [CDFS_NEW] Fix headers inclusion so that it can work on a *nix platform --- drivers/filesystems/cdfs_new/allocsup.c | 2 +- drivers/filesystems/cdfs_new/cachesup.c | 2 +- drivers/filesystems/cdfs_new/cddata.c | 2 +- drivers/filesystems/cdfs_new/cdinit.c | 2 +- drivers/filesystems/cdfs_new/cdprocs.h | 6 +++--- drivers/filesystems/cdfs_new/cleanup.c | 2 +- drivers/filesystems/cdfs_new/close.c | 2 +- drivers/filesystems/cdfs_new/create.c | 2 +- drivers/filesystems/cdfs_new/devctrl.c | 2 +- drivers/filesystems/cdfs_new/deviosup.c | 2 +- drivers/filesystems/cdfs_new/dirctrl.c | 2 +- drivers/filesystems/cdfs_new/dirsup.c | 2 +- drivers/filesystems/cdfs_new/fieldoff.c | 2 +- drivers/filesystems/cdfs_new/fileinfo.c | 2 +- drivers/filesystems/cdfs_new/filobsup.c | 2 +- drivers/filesystems/cdfs_new/fsctrl.c | 2 +- drivers/filesystems/cdfs_new/fspdisp.c | 2 +- drivers/filesystems/cdfs_new/lockctrl.c | 2 +- drivers/filesystems/cdfs_new/namesup.c | 2 +- drivers/filesystems/cdfs_new/pathsup.c | 2 +- drivers/filesystems/cdfs_new/pnp.c | 2 +- drivers/filesystems/cdfs_new/prefxsup.c | 2 +- drivers/filesystems/cdfs_new/read.c | 2 +- drivers/filesystems/cdfs_new/resrcsup.c | 2 +- drivers/filesystems/cdfs_new/strucsup.c | 2 +- drivers/filesystems/cdfs_new/verfysup.c | 2 +- drivers/filesystems/cdfs_new/volinfo.c | 2 +- drivers/filesystems/cdfs_new/workque.c | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/filesystems/cdfs_new/allocsup.c b/drivers/filesystems/cdfs_new/allocsup.c index d3129a3b46..b875eca143 100755 --- a/drivers/filesystems/cdfs_new/allocsup.c +++ b/drivers/filesystems/cdfs_new/allocsup.c @@ -44,7 +44,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cachesup.c b/drivers/filesystems/cdfs_new/cachesup.c index b31422f97e..87b75bbc51 100755 --- a/drivers/filesystems/cdfs_new/cachesup.c +++ b/drivers/filesystems/cdfs_new/cachesup.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cddata.c b/drivers/filesystems/cdfs_new/cddata.c index db9d8940de..dbd572a797 100755 --- a/drivers/filesystems/cdfs_new/cddata.c +++ b/drivers/filesystems/cdfs_new/cddata.c @@ -17,7 +17,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" #ifdef CD_SANITY BOOLEAN CdTestTopLevel = TRUE; diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index f0faef6af3..e66bd75377 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h index 87fcc5a37d..c9d34d2517 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -28,9 +28,9 @@ Abstract: #endif #include "nodetype.h" -#include "Cd.h" -#include "CdStruc.h" -#include "CdData.h" +#include "cd.h" +#include "cdstruc.h" +#include "cddata.h" //**** x86 compiler bug **** diff --git a/drivers/filesystems/cdfs_new/cleanup.c b/drivers/filesystems/cdfs_new/cleanup.c index 70faad7209..4c621e5c2f 100755 --- a/drivers/filesystems/cdfs_new/cleanup.c +++ b/drivers/filesystems/cdfs_new/cleanup.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/close.c b/drivers/filesystems/cdfs_new/close.c index 9090c6e2c8..d2827793c6 100755 --- a/drivers/filesystems/cdfs_new/close.c +++ b/drivers/filesystems/cdfs_new/close.c @@ -42,7 +42,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/create.c b/drivers/filesystems/cdfs_new/create.c index 1458ea2d44..bb072da107 100755 --- a/drivers/filesystems/cdfs_new/create.c +++ b/drivers/filesystems/cdfs_new/create.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs_new/devctrl.c index 7efebef13a..786a36d924 100755 --- a/drivers/filesystems/cdfs_new/devctrl.c +++ b/drivers/filesystems/cdfs_new/devctrl.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/deviosup.c b/drivers/filesystems/cdfs_new/deviosup.c index 50bafd3936..0c5c9d2bff 100755 --- a/drivers/filesystems/cdfs_new/deviosup.c +++ b/drivers/filesystems/cdfs_new/deviosup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/dirctrl.c b/drivers/filesystems/cdfs_new/dirctrl.c index 3964904a5f..29265a844a 100755 --- a/drivers/filesystems/cdfs_new/dirctrl.c +++ b/drivers/filesystems/cdfs_new/dirctrl.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/dirsup.c b/drivers/filesystems/cdfs_new/dirsup.c index 6e02c2e943..6a652eb84b 100755 --- a/drivers/filesystems/cdfs_new/dirsup.c +++ b/drivers/filesystems/cdfs_new/dirsup.c @@ -65,7 +65,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fieldoff.c b/drivers/filesystems/cdfs_new/fieldoff.c index c307c10834..63bc236e03 100755 --- a/drivers/filesystems/cdfs_new/fieldoff.c +++ b/drivers/filesystems/cdfs_new/fieldoff.c @@ -1,4 +1,4 @@ -#include "CdProcs.h" +#include "cdprocs.h" #include <stdio.h> #define doit(a,b) { printf("%s %04lx %4lx %s\n", #a, FIELD_OFFSET(a,b), sizeof(d.b), #b); } diff --git a/drivers/filesystems/cdfs_new/fileinfo.c b/drivers/filesystems/cdfs_new/fileinfo.c index c357d3c996..b4a185a98a 100755 --- a/drivers/filesystems/cdfs_new/fileinfo.c +++ b/drivers/filesystems/cdfs_new/fileinfo.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/filobsup.c b/drivers/filesystems/cdfs_new/filobsup.c index 909d1a89a2..00ab96b974 100755 --- a/drivers/filesystems/cdfs_new/filobsup.c +++ b/drivers/filesystems/cdfs_new/filobsup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 7a0bdbd674..95dda725a6 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/fspdisp.c b/drivers/filesystems/cdfs_new/fspdisp.c index b7c4e80b62..a3b89b96cf 100755 --- a/drivers/filesystems/cdfs_new/fspdisp.c +++ b/drivers/filesystems/cdfs_new/fspdisp.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/lockctrl.c b/drivers/filesystems/cdfs_new/lockctrl.c index a986fb35ec..149d4ecb5c 100755 --- a/drivers/filesystems/cdfs_new/lockctrl.c +++ b/drivers/filesystems/cdfs_new/lockctrl.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/namesup.c b/drivers/filesystems/cdfs_new/namesup.c index 8cdfb12d41..08c9d62922 100755 --- a/drivers/filesystems/cdfs_new/namesup.c +++ b/drivers/filesystems/cdfs_new/namesup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/pathsup.c b/drivers/filesystems/cdfs_new/pathsup.c index 607a10502b..2428c9d5f2 100755 --- a/drivers/filesystems/cdfs_new/pathsup.c +++ b/drivers/filesystems/cdfs_new/pathsup.c @@ -73,7 +73,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs_new/pnp.c index 1447536d74..c9106fe958 100755 --- a/drivers/filesystems/cdfs_new/pnp.c +++ b/drivers/filesystems/cdfs_new/pnp.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/prefxsup.c b/drivers/filesystems/cdfs_new/prefxsup.c index c00b98e50e..75d6b027d4 100755 --- a/drivers/filesystems/cdfs_new/prefxsup.c +++ b/drivers/filesystems/cdfs_new/prefxsup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/read.c b/drivers/filesystems/cdfs_new/read.c index 9e18fd3043..cadf3c464f 100755 --- a/drivers/filesystems/cdfs_new/read.c +++ b/drivers/filesystems/cdfs_new/read.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c index b062c1b7c6..66224050cf 100755 --- a/drivers/filesystems/cdfs_new/resrcsup.c +++ b/drivers/filesystems/cdfs_new/resrcsup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/strucsup.c b/drivers/filesystems/cdfs_new/strucsup.c index be42daf6cf..58210ad7a1 100755 --- a/drivers/filesystems/cdfs_new/strucsup.c +++ b/drivers/filesystems/cdfs_new/strucsup.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/verfysup.c b/drivers/filesystems/cdfs_new/verfysup.c index dae9c01147..24c671afc2 100755 --- a/drivers/filesystems/cdfs_new/verfysup.c +++ b/drivers/filesystems/cdfs_new/verfysup.c @@ -13,7 +13,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/volinfo.c b/drivers/filesystems/cdfs_new/volinfo.c index 2abce7f739..d0962fb4b8 100755 --- a/drivers/filesystems/cdfs_new/volinfo.c +++ b/drivers/filesystems/cdfs_new/volinfo.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module diff --git a/drivers/filesystems/cdfs_new/workque.c b/drivers/filesystems/cdfs_new/workque.c index 83db3a49c5..f242c8cca3 100755 --- a/drivers/filesystems/cdfs_new/workque.c +++ b/drivers/filesystems/cdfs_new/workque.c @@ -14,7 +14,7 @@ Abstract: --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module

1 0

[reactos] 01/01: Update pull request template with additional info
by Alexander Shaposhnikov 06 Nov '17

06 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd880924d98af170b0d65… commit bd880924d98af170b0d658c866da7ca83b12576c Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Mon Nov 6 19:28:12 2017 +0200 Update pull request template with additional info --- .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c475bf0ce8..8622a6e683 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,9 +5,15 @@ _Do a quick recap of your work here._ JIRA issue: [CORE-XXXX](https://jira.reactos.org/browse/CORE-XXXX) ## Proposed changes + +_Describe what you propose to change/add/fix with this pull request._ + - - ## TODO -- [ ] Task 1 -- [ ] Task 2 + +_Use a TODO when your pull request is Work in Progress._ + +- [ ] +- [ ]

1 0

[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
by Joachim Henze 06 Nov '17

06 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=516442544a28e09ea7c23… commit 516442544a28e09ea7c2385b2812a7ee1f65e291 Author: Joachim Henze <Joachim.Henze(a)reactos.org> 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/mirand… -SHA1 = 318b9283adf73d1ec92990c72296bb3882110c0c +URLDownload = https://web.archive.org/web/20140327190905/http://files.miranda-im.org/stab… +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 = Відкрита мультипротокольна програма миттєвих повідомлень - може не працювати повністю.

1 0

[reactos] 01/01: [RAPPS] Reflect installation status it download dialog header.
by Alexander Shaposhnikov 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47bbd637d8d0b8d012e40… commit 47bbd637d8d0b8d012e4071b3bdae83d938267d8 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> 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(&shExInfo)) { + //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);

1 0

[reactos] 01/01: [SETUPAPI]: CM_Open_DevNode_Key_Ex: FIXME/ERR --> TRACE
by Eric Kohl 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a372398a68c062fe31e… commit a2a372398a68c062fe31e8fe72924145209246de Author: Eric Kohl <eric.kohl(a)reactos.org> 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) {

1 0

[reactos] 01/01: [SETUPAPI] GetDeviceInstanceKeyPath: Fix temporary buffer allocation, add missing code paths and fix registry paths. This should fix parts of CORE-13944.
by Eric Kohl 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d57b0ef91e32e9ab160ad… commit d57b0ef91e32e9ab160ade36cb1f8003fd810702 Author: Eric Kohl <eric.kohl(a)reactos.org> 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) {

1 0

[reactos] 02/02: [CDFS] Set the FO_CLEANUP_COMPLETE on cleanup
by Pierre Schweitzer 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f65b294f21549e7331c61… commit f65b294f21549e7331c6117372d245d45317417e Author: Pierre Schweitzer <pierre(a)reactos.org> 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; }

1 0

[reactos] 01/02: [CDFS] Don't allow FS opening when volume is locked
by Pierre Schweitzer 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=244b4f99b384c921a16e5… commit 244b4f99b384c921a16e5b39e9a0af608c263ad8 Author: Pierre Schweitzer <pierre(a)reactos.org> 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, &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 */

1 0

[reactos] 03/03: [BROWSEUI] CBandSiteMenu
by Stas'M 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=484f33f0d3bcf339f0eb2… commit 484f33f0d3bcf339f0eb287cd9673459cd964897 Author: Stas'M <x86corez(a)gmail.com> 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, &m_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, &m_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<IShellFolderBand> pISFB; hr = CISFBand_CreateInstance(IID_IShellFolderBand, (PVOID*)&pISFB); @@ -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);

1 0

[reactos] 02/03: [CMAKE] Quick Launch shortcuts for Live/Hybrid CD
by Stas'M 05 Nov '17

05 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=275ab7ba2f9c347003ed7… commit 275ab7ba2f9c347003ed7f50912ce7e37c365281 Author: Stas'M <x86corez(a)gmail.com> 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})

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