Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [GITPOD]Add gitpod config
by Jérôme Gardou 02 Apr '20

02 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04d0d95b8a0d28a44afe4… commit 04d0d95b8a0d28a44afe448fb278ce5e8bf57327 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 17 11:53:18 2020 +0000 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 2 18:03:18 2020 +0200 [GITPOD]Add gitpod config this commit adds support for Gitpod.io, a free automated dev environment that makes contributing and generally working on GitHub projects much easier. It allows anyone to start a ready-to-code dev environment for any branch, issue and pull request with a single click. --- .gitpod.Dockerfile | 23 +++++++++++++ .gitpod.yml | 18 +++++++++++ .theia/launch.json | 29 +++++++++++++++++ .theia/settings.json | 10 ++++++ .theia/tasks.json | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 171 insertions(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 00000000000..5e090eb7cdf --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,23 @@ +FROM gitpod/workspace-full-vnc + +USER gitpod + +# Install custom tools, runtime, etc. using apt-get +# For example, the command below would install "bastet" - a command line tetris clone: +# +# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/* +# +# More information: https://www.gitpod.io/docs/config-docker/ +RUN sudo apt-get -q update && \ + sudo apt-get -yq upgrade && \ + sudo apt-get -yq install qemu-system-x86 qemu-utils gdb-mingw-w64 && \ + sudo rm -rf /var/lib/apt/lists/* + +RUN wget https://svn.reactos.org/amine/RosBEBinFull.tar.gz && \ + sudo tar -xzf RosBEBinFull.tar.gz -C /usr/local && \ + sudo mv /usr/local/RosBEBinFull /usr/local/RosBE && \ + rm -f RosBEBinFull.tar.gz + +RUN echo 'export PATH=/usr/local/RosBE/i386/bin:$PATH' >> /home/gitpod/.profile + +RUN qemu-img create -f qcow2 reactos_hdd.qcow 10G diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000000..9eb9fb144fc --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,18 @@ +tasks: + - before: > + brew install cmake ninja + init: > + mkdir -p /workspace/reactos/build && + cd /workspace/reactos/build && + cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DGDB:BOOL=TRUE -DSEPARATE_DBG:BOOL=TRUE -D_WINKD_:BOOL=TRUE -DKDBG:BOOL=FALSE -DENABLE_ROSTESTS:BOOL=TRUE -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -G "Ninja" && + ninja xdk psdk + command: > + cd /workspace/reactos/build && + ninja all + +image: + file: .gitpod.Dockerfile + +vscode: + extensions: + - ms-vscode.cpptools@0.27.0-insiders3:Djj3Csw0GXjmueWAPWvTsg== diff --git a/.theia/launch.json b/.theia/launch.json new file mode 100644 index 00000000000..8a7abb7111b --- /dev/null +++ b/.theia/launch.json @@ -0,0 +1,29 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + "version": "0.2.0", + "configurations": [ + { + "type": "cppdbg", + "request": "launch", + "name": "livecd (qemu)", + "preLaunchTask": "launch livecd", + "miDebuggerServerAddress": "localhost:9091", + "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'", + "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe", + "cwd": "${workspaceRoot}/build", + "miDebuggerPath": "i686-w64-mingw32-gdb" + }, + { + "type": "cppdbg", + "request": "launch", + "name": "bootcd (qemu)", + "preLaunchTask": "launch bootcd", + "miDebuggerServerAddress": "localhost:9091", + "miDebuggerArgs": "-l 15 -ex 'set sysroot ${workspaceRoot}/build/symbols'", + "program": "${workspaceRoot}/build/ntoskrnl/ntoskrnl.exe", + "cwd": "${workspaceRoot}/build", + "miDebuggerPath": "i686-w64-mingw32-gdb" + } + ] +} diff --git a/.theia/settings.json b/.theia/settings.json new file mode 100644 index 00000000000..4f270f4945c --- /dev/null +++ b/.theia/settings.json @@ -0,0 +1,10 @@ +{ + "cpp.buildConfigurations": [ + { + "name": "build", + "directory": "${workspaceFolder}/build" + } + ], + "cpp.clangdArgs": "--background-index", + "C_Cpp.intelliSenseEngine": "Disabled", +} diff --git a/.theia/tasks.json b/.theia/tasks.json new file mode 100644 index 00000000000..58d78516f95 --- /dev/null +++ b/.theia/tasks.json @@ -0,0 +1,91 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "build livecd", + "type": "shell", + "command": "ninja livecd", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "group": "build", + "problemMatcher": [ + { + "owner": "cpp", + "fileLocation": ["relative", "${workspaceFolder}/build"], + "pattern": { + "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 + } + } + ] + }, + { + "label": "build bootcd", + "type": "shell", + "command": "ninja bootcd", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "group": "build", + "problemMatcher": [ + { + "base": "$gcc", + "fileLocation": ["relative", "${workspaceFolder}/build"], + }, + ] + }, + { + "label": "launch livecd", + "type": "process", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "dependsOn": [ + "build livecd" + ], + "dependsOrder": "sequence", + "command": "qemu-system-i386", + "args": [ + "-cdrom", "livecd.iso", + "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0", + "-serial", "chardev:char0", + "-nic", "user,model=e1000", + "-boot", "d", + "-chardev", "socket,path=/tmp/livecd_dbg,server,nowait,id=char1", "-serial", "chardev:char1", + "-daemonize" + ], + "problemMatcher": [] + }, + { + "label": "launch bootcd", + "type": "process", + "options": { + "cwd": "${workspaceFolder}/build" + }, + "dependsOn": [ + "build bootcd" + ], + "dependsOrder": "sequence", + "command": "qemu-system-i386", + "args": [ + "-cdrom", "bootcd.iso", + "-hda", "${env:HOME}/reactos_hdd.qcow", + "-boot", "d", + "-m", "1024", + "-chardev", "socket,port=9091,host=localhost,server,nowait,id=char0", + "-serial", "chardev:char0", + "-nic", "user,model=e1000", + "-chardev", "socket,path=/tmp/bootcd_dbg,server,nowait,id=char1", "-serial", "chardev:char1", + "-daemonize" + ], + "problemMatcher": [] + }, + ], +}

1 0

[reactos] 01/01: [RDBSS] Avoid CORE-13938
by Joachim Henze 02 Apr '20

02 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b5ec8e7bf4e95c3a182… commit 45b5ec8e7bf4e95c3a1826f7b13e2b225d8f81bc Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 17 20:28:15 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Apr 2 15:09:46 2020 +0200 [RDBSS] Avoid CORE-13938 Pierre recommended this workaround for 0.4.8rls before. Avoids "GetVolumeInformation now fails on NFS volume" This workaround was recurrently applied for all releases 0.4.8, 0.4.9, 0.4.10, 0.4.11, 0.4.12, 0.4.13. I never got any reply in the regression-ticket and recurrently applying this over and over again is a waste of time. So I decided to commit to master today, but will leave the ticket unresolved, so when a proper fix will arrive in the future, the existing ticket will remind us to undo this workaround. Please note that I replaced #if 0 with #if 1 as discussed with Pierre. That's different to the patch in ticket. --- sdk/lib/drivers/rdbsslib/rdbss.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 851b0f543a3..4fe01867172 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -8319,6 +8319,16 @@ RxQueryNameInfo( return STATUS_BUFFER_OVERFLOW; } +#if 1 // CORE-13938, rfb: please note I replaced 0 with 1 here + if (NodeType(Fcb) == RDBSS_NTC_STORAGE_TYPE_DIRECTORY && + RxContext->Info.LengthRemaining >= sizeof(WCHAR)) + { + NameInfo->FileName[NameInfo->FileNameLength / sizeof(WCHAR)] = L'\\'; + NameInfo->FileNameLength += sizeof(WCHAR); + RxContext->Info.LengthRemaining -= sizeof(WCHAR); + } +#endif + /* All correct */ return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [NTOS:MM] Using the macro MiIsPteOnPdeBoundary(). (#2496)
by Vadim Galyant 02 Apr '20

02 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b78cb36d910dd2e881844… commit b78cb36d910dd2e881844e96fd3e2c11cacd32cd Author: Vadim Galyant <vgal(a)rambler.ru> AuthorDate: Thu Apr 2 13:15:33 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 2 12:15:33 2020 +0200 [NTOS:MM] Using the macro MiIsPteOnPdeBoundary(). (#2496) The SYSTEM_PD_SIZE constant should not be used to determine the page boundary for page tables. It is better to use the portable MiIsPteOnPdeBoundary() macro for this. --- ntoskrnl/mm/ARM3/section.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index abac73207cd..7d4e45c4af8 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -647,7 +647,7 @@ MiSegmentDelete(IN PSEGMENT Segment) while (PointerPte < LastPte) { /* Check if it's time to switch master PTEs if we passed a PDE boundary */ - if (!((ULONG_PTR)PointerPte & (PD_SIZE - 1)) && + if (MiIsPteOnPdeBoundary(PointerPte) && (PointerPte != Subsection->SubsectionBase)) { /* Check if the master PTE is invalid */ @@ -2150,7 +2150,7 @@ MiSetProtectionOnSection(IN PEPROCESS Process, // // Check if we've crossed a PDE boundary and make the new PDE valid too // - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { PointerPde = MiPteToPde(PointerPte); MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL);

1 0

[reactos] 01/01: [STOBJECT] Change eject hardware dialog buttons from OK/Cancel to just OK. (#2493)
by Jared Smudde 01 Apr '20

01 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a725ae5745c89ce9e75… commit a5a725ae5745c89ce9e7591c69e0714e648a9830 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Wed Apr 1 04:42:24 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 1 11:42:24 2020 +0200 [STOBJECT] Change eject hardware dialog buttons from OK/Cancel to just OK. (#2493) It's just an information dialog that needs one button, it's not actually doing different actions based on user input. --- dll/shellext/stobject/hotplug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index a57976a9c89..a8968818236 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -200,11 +200,11 @@ static void _ShowContextMenu(CSysTray * pSysTray) { WCHAR strInfo[128]; swprintf(strInfo, L"Problem Ejecting %wS", g_strMenuSel); - MessageBox(0, L"The device cannot be stopped right now! Try stopping it again later!", strInfo, MB_OKCANCEL | MB_ICONEXCLAMATION); + MessageBox(0, L"The device cannot be stopped right now! Try stopping it again later!", strInfo, MB_OK | MB_ICONEXCLAMATION); } else { - //MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OKCANCEL | MB_ICONINFORMATION); + //MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OK | MB_ICONINFORMATION); g_IsRemoving = TRUE; g_devList.RemoveAt(id); /* thing is.. even after removing id at this point, the devnode_change occurs after some seconds of sucessful removal and since pendrive is still plugged in it gets enumerated, if problem number is not filtered.

1 0

[reactos] 01/01: [SPEC2DEF] Omit skipped exports from ordinal numbering. CORE-16769
by Mark Jansen 31 Mar '20

31 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1464a4030c6f9438becb… commit c1464a4030c6f9438becbbeffb83e1d5de100454 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 30 19:41:14 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Mar 31 22:49:44 2020 +0200 [SPEC2DEF] Omit skipped exports from ordinal numbering. CORE-16769 --- sdk/tools/spec2def/spec2def.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index b929487069d..c1ac211ccc0 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -1332,7 +1332,7 @@ ApplyOrdinals(EXPORT* pexports, unsigned cExports) /* Pass 2: apply available ordinals */ for (i = 0, j = 1; i < cExports; i++) { - if ((pexports[i].uFlags & FL_ORDINAL) == 0) + if ((pexports[i].uFlags & FL_ORDINAL) == 0 && pexports[i].bVersionIncluded) { while (used[j] != 0) j++;

1 0

[reactos] 01/01: [HOTPLUG] Display class icons for removable devices
by Eric Kohl 31 Mar '20

31 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45e79efd06adc2348d566… commit 45e79efd06adc2348d56627689b37bbcaa05eea5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Mar 31 22:43:42 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Mar 31 22:44:31 2020 +0200 [HOTPLUG] Display class icons for removable devices --- dll/cpl/hotplug/hotplug.c | 82 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 7 deletions(-) diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 7152e487075..17788fc8212 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -11,6 +11,12 @@ #define NDEBUG #include <debug.h> +typedef struct _HOTPLUG_DATA +{ + SP_CLASSIMAGELIST_DATA ImageListData; +} HOTPLUG_DATA, *PHOTPLUG_DATA; + + // globals HINSTANCE hApplet = 0; @@ -23,7 +29,9 @@ APPLET Applets[NUM_APPLETS] = static VOID -EnumHotpluggedDevices(HWND hwndDeviceTree) +EnumHotpluggedDevices( + HWND hwndDeviceTree, + PHOTPLUG_DATA pHotplugData) { WCHAR szDisplayName[40]; SP_DEVINFO_DATA did = { 0 }; @@ -32,6 +40,10 @@ EnumHotpluggedDevices(HWND hwndDeviceTree) DWORD dwCapabilities, dwSize; ULONG ulStatus, ulProblem; TVINSERTSTRUCTW tvItem; +// HTREEITEM hTreeItem; + WCHAR szGuidString[MAX_GUID_STRING_LEN]; + GUID ClassGuid; + INT nClassImage; CONFIGRET cr; TreeView_DeleteAllItems(hwndDeviceTree); @@ -84,20 +96,42 @@ EnumHotpluggedDevices(HWND hwndDeviceTree) if (cr != CR_SUCCESS) wcscpy(szDisplayName, L"Unknown Device"); + /* Get the class GUID */ + dwSize = sizeof(szGuidString); + cr = CM_Get_DevNode_Registry_Property(did.DevInst, + CM_DRP_CLASSGUID, + NULL, + szGuidString, + &dwSize, + 0); + if (cr == CR_SUCCESS) + { + pSetupGuidFromString(szGuidString, &ClassGuid); + } + else + { +// memcpy(&ClassGuid, GUID_DEVCLASS_UNKNOWN, sizeof(GUID)); + } + + /* Get the image for the class this device is in */ + SetupDiGetClassImageIndex(&pHotplugData->ImageListData, + &ClassGuid, + &nClassImage); + /* Add it to the device tree */ ZeroMemory(&tvItem, sizeof(tvItem)); tvItem.hParent = TVI_ROOT; tvItem.hInsertAfter = TVI_FIRST; - tvItem.item.mask = TVIF_STATE | TVIF_TEXT /*| TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE */; + tvItem.item.mask = TVIF_STATE | TVIF_TEXT /*| TVIF_PARAM*/ | TVIF_IMAGE | TVIF_SELECTEDIMAGE; tvItem.item.state = TVIS_EXPANDED; tvItem.item.stateMask = TVIS_EXPANDED; tvItem.item.pszText = szDisplayName; -// tvItem.item.iImage = IMAGE_SOUND_SECTION; -// tvItem.item.iSelectedImage = IMAGE_SOUND_SECTION; + tvItem.item.iImage = nClassImage; + tvItem.item.iSelectedImage = nClassImage; tvItem.item.lParam = (LPARAM)NULL; - /*hTreeItem = */ TreeView_InsertItem(hwndDeviceTree, &tvItem); + /*hTreeItem =*/ TreeView_InsertItem(hwndDeviceTree, &tvItem); @@ -116,12 +150,31 @@ SafeRemovalDlgProc( WPARAM wParam, LPARAM lParam) { + PHOTPLUG_DATA pHotplugData; + UNREFERENCED_PARAMETER(lParam); + + pHotplugData = (PHOTPLUG_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE)); + pHotplugData = HeapAlloc(GetProcessHeap(), 0, sizeof(HOTPLUG_DATA)); + if (pHotplugData != NULL) + { + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pHotplugData); + + pHotplugData->ImageListData.cbSize = sizeof(pHotplugData->ImageListData); + SetupDiGetClassImageList(&pHotplugData->ImageListData); + + TreeView_SetImageList(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), + pHotplugData->ImageListData.ImageList, + TVSIL_NORMAL); + + EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), + pHotplugData); + } return TRUE; case WM_COMMAND: @@ -148,7 +201,12 @@ SafeRemovalDlgProc( if (wParam == 1) { KillTimer(hwndDlg, 1); - EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE)); + + if (pHotplugData != NULL) + { + EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE), + pHotplugData); + } } break; @@ -156,6 +214,16 @@ SafeRemovalDlgProc( KillTimer(hwndDlg, 1); EndDialog(hwndDlg, TRUE); break; + + case WM_DESTROY: + if (pHotplugData != NULL) + { + SetupDiDestroyClassImageList(&pHotplugData->ImageListData); + + HeapFree(GetProcessHeap(), 0, pHotplugData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL); + } + break; } return FALSE;

1 0

[reactos] 01/01: [CONFIGURE] Simplify version detection for modern Visual Studio
by Victor Perevertkin 31 Mar '20

31 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d37799ea3e52a74493eae… commit d37799ea3e52a74493eae40f861b4a5f6a3b8b8f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Mar 31 12:29:56 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Mar 31 12:29:56 2020 +0300 [CONFIGURE] Simplify version detection for modern Visual Studio --- configure.cmd | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/configure.cmd b/configure.cmd index acbf3da1bd2..1cee20afc3f 100755 --- a/configure.cmd +++ b/configure.cmd @@ -54,18 +54,8 @@ if defined ROS_ARCH ( cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 - cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15 - cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16 - cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16 - cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16 - cl 2>&1 | find "19.23." > NUL && set VS_VERSION=16 - cl 2>&1 | find "19.24." > NUL && set VS_VERSION=16 + cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 + cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

[reactos] 01/01: [HOTPLUG] Add 32 pixel icon. (#2486)
by Jared Smudde 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aa58c19a607658a61a83… commit 8aa58c19a607658a61a833fab84775ee72f061cb Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Mon Mar 30 16:54:17 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 23:54:17 2020 +0200 [HOTPLUG] Add 32 pixel icon. (#2486) Add a 32 pixel icon to the main icon for hotplug.cpl so the Safely Remove Hardware dialog looks normal. --- dll/cpl/hotplug/resources/1.ico | Bin 2550 -> 9062 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/cpl/hotplug/resources/1.ico b/dll/cpl/hotplug/resources/1.ico index f615f0ebd3c..8e5ba04caa9 100644 Binary files a/dll/cpl/hotplug/resources/1.ico and b/dll/cpl/hotplug/resources/1.ico differ

1 0

[reactos] 01/01: [HOTPLUG] Show removable devices and update the list on arrival and removal.
by Eric Kohl 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbdf649f2cb6ee27b8333… commit cbdf649f2cb6ee27b8333860b916a05037e9d211 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 30 23:11:44 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 30 23:11:44 2020 +0200 [HOTPLUG] Show removable devices and update the list on arrival and removal. --- dll/cpl/hotplug/hotplug.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ dll/cpl/hotplug/hotplug.h | 4 ++ 2 files changed, 115 insertions(+) diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index c67d0d80376..7152e487075 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -21,6 +21,93 @@ APPLET Applets[NUM_APPLETS] = }; +static +VOID +EnumHotpluggedDevices(HWND hwndDeviceTree) +{ + WCHAR szDisplayName[40]; + SP_DEVINFO_DATA did = { 0 }; + HDEVINFO hdev; + int idev; + DWORD dwCapabilities, dwSize; + ULONG ulStatus, ulProblem; + TVINSERTSTRUCTW tvItem; + CONFIGRET cr; + + TreeView_DeleteAllItems(hwndDeviceTree); + + hdev = SetupDiGetClassDevs(NULL, NULL, 0, DIGCF_ALLCLASSES | DIGCF_PRESENT); + if (hdev == INVALID_HANDLE_VALUE) + return; + + did.cbSize = sizeof(did); + + /* Enumerate all the attached devices */ + for (idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); idev++) + { + ulStatus = 0; + ulProblem = 0; + + cr = CM_Get_DevNode_Status(&ulStatus, + &ulProblem, + did.DevInst, + 0); + if (cr != CR_SUCCESS) + continue; + + dwCapabilities = 0, + dwSize = sizeof(dwCapabilities); + cr = CM_Get_DevNode_Registry_Property(did.DevInst, + CM_DRP_CAPABILITIES, + NULL, + &dwCapabilities, + &dwSize, + 0); + if (cr != CR_SUCCESS) + continue; + + /* Add devices that require safe removal to the device tree */ + if ( (dwCapabilities & CM_DEVCAP_REMOVABLE) && + !(dwCapabilities & CM_DEVCAP_DOCKDEVICE) && + !(dwCapabilities & CM_DEVCAP_SURPRISEREMOVALOK) && + ((dwCapabilities & CM_DEVCAP_EJECTSUPPORTED) || (ulStatus & DN_DISABLEABLE)) && + ulProblem == 0) + { + /* Get the device description */ + dwSize = sizeof(szDisplayName); + cr = CM_Get_DevNode_Registry_Property(did.DevInst, + CM_DRP_DEVICEDESC, + NULL, + szDisplayName, + &dwSize, + 0); + if (cr != CR_SUCCESS) + wcscpy(szDisplayName, L"Unknown Device"); + + /* Add it to the device tree */ + ZeroMemory(&tvItem, sizeof(tvItem)); + tvItem.hParent = TVI_ROOT; + tvItem.hInsertAfter = TVI_FIRST; + + tvItem.item.mask = TVIF_STATE | TVIF_TEXT /*| TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE */; + tvItem.item.state = TVIS_EXPANDED; + tvItem.item.stateMask = TVIS_EXPANDED; + tvItem.item.pszText = szDisplayName; +// tvItem.item.iImage = IMAGE_SOUND_SECTION; +// tvItem.item.iSelectedImage = IMAGE_SOUND_SECTION; + tvItem.item.lParam = (LPARAM)NULL; + + /*hTreeItem = */ TreeView_InsertItem(hwndDeviceTree, &tvItem); + + + + } + } + + SetupDiDestroyDeviceInfoList(hdev); +} + + INT_PTR CALLBACK SafeRemovalDlgProc( @@ -34,17 +121,41 @@ SafeRemovalDlgProc( switch (uMsg) { case WM_INITDIALOG: + EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE)); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDCLOSE: + KillTimer(hwndDlg, 1); EndDialog(hwndDlg, TRUE); break; } break; + + case WM_DEVICECHANGE: + switch (wParam) + { + case DBT_DEVNODES_CHANGED: + SetTimer(hwndDlg, 1, 500, NULL); + break; + } + break; + + case WM_TIMER: + if (wParam == 1) + { + KillTimer(hwndDlg, 1); + EnumHotpluggedDevices(GetDlgItem(hwndDlg, IDC_SAFE_REMOVE_DEVICE_TREE)); + } + break; + + case WM_CLOSE: + KillTimer(hwndDlg, 1); + EndDialog(hwndDlg, TRUE); + break; } return FALSE; diff --git a/dll/cpl/hotplug/hotplug.h b/dll/cpl/hotplug/hotplug.h index b21d59a0235..38beaac69c3 100644 --- a/dll/cpl/hotplug/hotplug.h +++ b/dll/cpl/hotplug/hotplug.h @@ -7,10 +7,14 @@ #include <wingdi.h> #include <winuser.h> #include <wincon.h> +#include <winreg.h> #include <commctrl.h> #include <cpl.h> #include <tchar.h> #include <limits.h> +#include <setupapi.h> +#include <cfgmgr32.h> +#include <dbt.h> #include "resource.h"

1 0

[reactos] 01/01: [ROSAPPS][PICE] Fix ROSAPPS-355 Unreachable code
by Joachim Henze 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30dcc229f06f395e55f3f… commit 30dcc229f06f395e55f3f94df5db310afdf56a42 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Mar 30 17:18:16 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Mar 30 17:18:16 2020 +0200 [ROSAPPS][PICE] Fix ROSAPPS-355 Unreachable code Just to satisfy static code analysis. No change in behavior expected. The same way as the external applications maintainers fixed it in their latest version https://sourceforge.net/projects/pice/files/pICE%20source/build_20/ By killing the whole function ScrollUp() with the disabled code. Like the original authors I left the functions unused declaration existing within hardware.h --- .../sysutils/utils/pice/module/hardware.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/modules/rosapps/applications/sysutils/utils/pice/module/hardware.c b/modules/rosapps/applications/sysutils/utils/pice/module/hardware.c index 65864a0373e..7d49b793eda 100644 --- a/modules/rosapps/applications/sysutils/utils/pice/module/hardware.c +++ b/modules/rosapps/applications/sysutils/utils/pice/module/hardware.c @@ -664,27 +664,6 @@ void ClrLine(ULONG line) ohandlers.ClrLine(line); } -//************************************************************************* -// ScrollUp() -// -// Scroll a specific window up one line -//************************************************************************* -void ScrollUp(USHORT Window) -{ - USHORT i; - - return; - - if(!wWindow[Window].bScrollDisabled) - { - for(i=1;i<wWindow[Window].cy;i++) - { - CopyLineTo((USHORT)(wWindow[Window].y+i-1),(USHORT)(wWindow[Window].y+i)); - } - ClrLine((USHORT)(wWindow[Window].y+wWindow[Window].cy-1)); - } -} - //************************************************************************* // Home() // @@ -848,7 +827,6 @@ void Print(USHORT Window,LPSTR p) if(wWindow[Window].usCurY>=wWindow[Window].cy) { wWindow[Window].usCurY=wWindow[Window].cy-1; - ScrollUp(Window); } if(wWindow[Window].bScrollDisabled==TRUE)break; }

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