Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/01: Happy New Year 2019 everybody!
by Hermès Bélusca-Maïto 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fc3447f3ec4272a13434… commit 3fc3447f3ec4272a13434fd7c1c424f15a6dab94 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 1 00:00:00 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 1 00:00:00 2019 +0100 Happy New Year 2019 everybody! --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/logo/1.bmp | Bin 21654 -> 21652 bytes sdk/include/reactos/version.cmake | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 4c8ecfe8c9..b069af6c87 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/reactos.svg index 2af08cf093..61aa38640d 100644 --- a/dll/win32/msgina/resources/reactos.svg +++ b/dll/win32/msgina/resources/reactos.svg @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2018 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2019 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 4c8ecfe8c9..b069af6c87 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/ntoskrnl/inbv/logo/1.bmp b/ntoskrnl/inbv/logo/1.bmp index 1c2c7bdd58..9c4e503872 100644 Binary files a/ntoskrnl/inbv/logo/1.bmp and b/ntoskrnl/inbv/logo/1.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index c1c22ee913..b0a49cca44 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -3,7 +3,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "12") -set(COPYRIGHT_YEAR "2018") +set(COPYRIGHT_YEAR "2019") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [TRANSLATION] Update Chinese translation. (#1212)
by Luo Yufan 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f54dbff5e97041022a3f… commit 9f54dbff5e97041022a3fe6f75ea1f2f5edd78c8 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Tue Jan 1 04:47:58 2019 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 31 21:47:58 2018 +0100 [TRANSLATION] Update Chinese translation. (#1212) --- dll/cpl/appwiz/lang/zh-CN.rc | 12 +++--- dll/cpl/appwiz/lang/zh-TW.rc | 48 +++++++++++----------- dll/cpl/intl/lang/zh-TW.rc | 4 +- dll/cpl/mmsys/lang/zh-TW.rc | 2 +- dll/win32/msgina/lang/zh-TW.rc | 2 +- dll/win32/netid/lang/zh-TW.rc | 2 +- .../applications/explorer-old/explorer-zh.rc | 16 ++++---- 7 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index a14128d0d4..cd43aaeaf0 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -64,7 +64,7 @@ END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko 安装包" +CAPTION "Wine Gecko 套件" FONT 9, "宋体" BEGIN CONTROL "ReactOS 无法找到使内嵌 HTML 的应用程序正常工作的 Wine Gecko 包。ReactOS 能为您自动下载并安装。", @@ -86,12 +86,12 @@ STRINGTABLE BEGIN IDS_DOWNLOADING "正在下载..." IDS_INSTALLING "正在安装..." - IDS_INVALID_SHA "下载的文件校验和错误。中止安装已损坏的文件。" + IDS_INVALID_SHA "下载的文件校验和错误。正在中止安装已损坏的文件。" IDS_NEW_INTERNET_SHORTCUT "新建 Internet 快捷方式" - IDS_DWL_FAILED "无法下载 Gecko 安装包。请确保您有互联网连接才能进行下载。安装程序将在不安装 Gecko 的情况下继续。" + IDS_DWL_FAILED "无法下载 Gecko 套件。请确保在您有互联网连接的情況下才能进行下载。安装程序将在不安装 Gecko 的情况下继续。" IDS_CANTMAKEINETSHORTCUT "无法创建 Internet 快捷方式" IDS_CANTMAKESHORTCUT "无法创建快捷方式。" - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" + IDS_NO_MEMORY "没有可以分配的内存空间。" + IDS_NO_DIRECTORY "没有指定路径。" + IDS_INVALID_PATH "指定的路径无效。" END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index ec7c78c638..7f499e1c37 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -1,15 +1,17 @@ /* - * Traditional Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-CN.rc) + * Traditional Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-TW.rc) * * TRANSLATOR: Henry Tang Ih (henrytang2 at hotmail dot com) + * Luo Yufan (njlyf2011 at hotmail dot com) * CREATED: 2016 + * MODIFIED: 2018 */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建連線" +CAPTION "新增捷徑" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "Text1", -1, 115, 15, 160, 24 @@ -18,7 +20,7 @@ END IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建連線" +CAPTION "新增捷徑" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "Text1",-1,10,0,225,40 @@ -28,14 +30,14 @@ END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建快捷方式" +CAPTION "新增捷徑" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "此精靈幫助您創建本地或網路程式、檔案、目錄、電腦或Internet地址的快捷方式。", -1, 120, 15, 200, 30 + LTEXT "此精靈幫助您創建本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "點選“下一步”繼續。", -1, 120, 97, 162, 10 + LTEXT "點選 [下一步] 繼續。", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -43,17 +45,17 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "選擇程式標題" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "輸入快捷方式名稱(&T)：", -1, 120, 15, 150, 10 + LTEXT "輸入捷徑名稱(&T)：", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "點選“完成”創建快捷方式", -1, 118, 97, 178, 17 + LTEXT "點選 [完成] 創建捷徑", -1, 118, 97, 178, 17 END IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "刪除快捷方式/資料夾" +CAPTION "刪除捷徑/資料夾" FONT 8, "新細明體" BEGIN - LTEXT "從「開始」選單中刪除項目，選擇項目並單擊刪除。(&T)", -1, 10, 10, 192, 16 + LTEXT "從「開始」功能表中刪除項目，選擇項目並單擊刪除。(&T)", -1, 10, 10, 192, 16 CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 PUSHBUTTON "刪除(&R)", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP @@ -62,10 +64,10 @@ END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko 安裝包" +CAPTION "Wine Gecko 套件" FONT 9, "新細明體" BEGIN - CONTROL "ReactOS找不到這嵌入 HTML 的應用程式正常工作所需的Wine Gecko包。 ReactOS 可以自動下載，併為您安裝。", + CONTROL "ReactOS 無法找到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。ReactOS 能為您自動下載並安裝。", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -74,9 +76,9 @@ END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "添加/刪除程式" - IDS_CPLSYSTEMDESCRIPTION "設定程式和快捷方式" - IDS_CREATE_SHORTCUT "建立快捷方式" + IDS_CPLSYSTEMNAME "新增/移除程式" + IDS_CPLSYSTEMDESCRIPTION "設定程式和捷徑" + IDS_CREATE_SHORTCUT "建立捷徑" IDS_ERROR_NOT_FOUND "找不到檔案 %s" END @@ -84,12 +86,12 @@ STRINGTABLE BEGIN IDS_DOWNLOADING "下載中..." IDS_INSTALLING "安裝中..." - IDS_INVALID_SHA "意外的下載了的檔案的校驗和。中止安裝已損壞的檔案。" - IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" - IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." - IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." - IDS_CANTMAKESHORTCUT "Failed to create shortcut." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" + IDS_INVALID_SHA "下載的檔案總和檢查碼錯誤。正在中止安裝已損毀的檔案。" + IDS_NEW_INTERNET_SHORTCUT "新增網際網路捷徑" + IDS_DWL_FAILED "無法下載 Gecko 套件。請確保在您有網際網路連線的情況下才能進行下載。安裝程式將在不安裝 Gecko 的情況下繼續。" + IDS_CANTMAKEINETSHORTCUT "無法建立網際網路捷徑。" + IDS_CANTMAKESHORTCUT "無法建立捷徑。" + IDS_NO_MEMORY "沒有可以分配的記憶體空間。" + IDS_NO_DIRECTORY "沒有指定路徑。" + IDS_INVALID_PATH "指定的路徑無效。" END diff --git a/dll/cpl/intl/lang/zh-TW.rc b/dll/cpl/intl/lang/zh-TW.rc index e1abafd0e3..a62596482e 100644 --- a/dll/cpl/intl/lang/zh-TW.rc +++ b/dll/cpl/intl/lang/zh-TW.rc @@ -45,12 +45,12 @@ END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "高階" +CAPTION "進階" FONT 9, "新細明體" BEGIN GROUPBOX "非 Unicode 程式的語言", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "這個設定啟動某些非 Unicode 程式以便用母語顯示選單和對話。這不會影響到 Unicode 的程式，但是會應用在這臺電腦上的所有使用者。", -1, 14, 18, 223, 33 + LTEXT "這個設定啟動某些非 Unicode 程式以便用母語顯示選單和對話。這不會影響到 Unicode 的程式，但是會應用在這部電腦上的所有使用者。", -1, 14, 18, 223, 33 LTEXT "選擇一種語言，使之與您想使用的非 Unicode 程式的語言版本相匹配(&S):", -1, 14, 55, 223, 18 GROUPBOX "內碼表轉換表(&C)", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 0b0bc22345..b44f7238db 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -173,7 +173,7 @@ FONT 9, "新細明體" BEGIN GROUPBOX "ReactOS 音訊", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "因為 ReactOS 音訊服務無效因此這臺電腦目前無法播放聲音", 10245, 60, 25, 150, 40 + LTEXT "因為 ReactOS 音訊服務無效因此這部電腦目前無法播放聲音", 10245, 60, 25, 150, 40 AUTOCHECKBOX "啟用ReactOS 音訊(&E)", 10253, 60, 68, 150, 9 LTEXT "注意", 10246, 58, 87, 150, 11 LTEXT "1. 您必須是管理員才能啟用此服務。如果您沒有以管理員身份登入，您將提示輸入管理員名稱和密碼。", 10247, 60, 100, 150, 40 diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index cc8d59a750..91db6aa66d 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -191,7 +191,7 @@ BEGIN IDS_LOGONDATE "登入日期: %s %s" IDS_COMPUTERLOCKED "鎖定電腦" IDS_LOCKEDWRONGPASSWORD "密碼是錯誤的。請再次輸入您的密碼。在密碼中的字母必須使用正確的大小寫。" - IDS_LOCKEDWRONGUSER "這臺電腦被鎖定。只有 %s\\%s 或者管理員可以解除電腦鎖定。" + IDS_LOCKEDWRONGUSER "這部電腦被鎖定。只有 %s\\%s 或者管理員可以解除電腦鎖定。" IDS_CHANGEPWDTITLE "更改密碼" IDS_NONMATCHINGPASSWORDS "您鍵入的密碼不匹配。在這兩個文字框中鍵入相同的密碼。" IDS_PASSWORDCHANGED "您的密碼已更改。" diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc index e076fc0fa7..a67d6a015c 100644 --- a/dll/win32/netid/lang/zh-TW.rc +++ b/dll/win32/netid/lang/zh-TW.rc @@ -70,7 +70,7 @@ BEGIN 22 "歡迎到 %1 工作群組。" 23 "歡迎到域 %1。" 24 "您必須重新啟動該電腦以使更改生效。" - 25 "您可以更改名稱和這臺電腦的會員。更改可能會影響對網路資源的訪問。" + 25 "您可以更改名稱和這部電腦的會員。更改可能會影響對網路資源的訪問。" 1021 "注意: 只有管理員纔可以更改此電腦的標識。" 1022 "注意: 不能更改電腦的標識，因為:" 1030 "新的電腦名稱 ""%s"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" diff --git a/modules/rosapps/applications/explorer-old/explorer-zh.rc b/modules/rosapps/applications/explorer-old/explorer-zh.rc index ef3757b6a9..55bd03cf59 100644 --- a/modules/rosapps/applications/explorer-old/explorer-zh.rc +++ b/modules/rosapps/applications/explorer-old/explorer-zh.rc @@ -39,7 +39,7 @@ BEGIN BEGIN MENUITEM "浏览器帮助文档(&F)...", ID_EXPLORER_FAQ MENUITEM "关于浏览器(&A)...", ID_ABOUT_EXPLORER - MENUITEM "关于操作系统(&O)...", ID_ABOUT_WINDOWS + MENUITEM "关于此系统(&O)...", ID_ABOUT_WINDOWS END END @@ -102,7 +102,7 @@ BEGIN BEGIN MENUITEM "浏览器帮助文档(&F)...", ID_EXPLORER_FAQ MENUITEM "关于浏览器(&A)...", ID_ABOUT_EXPLORER - MENUITEM "关于操作系统(&O)...", ID_ABOUT_WINDOWS + MENUITEM "关于此系统(&O)...", ID_ABOUT_WINDOWS END END @@ -163,7 +163,7 @@ FONT 9, "宋体" BEGIN CONTROL "显示时钟(&C)", ID_SHOW_CLOCK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 152, 52, 10 CONTROL "隐藏不活动的通知区图标(&H)", ID_HIDE_INACTIVE_ICONS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 174, 111, 10 - PUSHBUTTON "任务栏通知区(&N)...", ID_CONFIG_NOTIFYAREA, 153, 173, 50, 14 + PUSHBUTTON "任务栏通知区域(&N)...", ID_CONFIG_NOTIFYAREA, 153, 173, 50, 14 END IDD_DESKBAR_STARTMENU DIALOGEX 0, 0, 210, 194 @@ -176,7 +176,7 @@ END IDD_NOTIFYAREA DIALOGEX 0, 0, 207, 150 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "配置通知区图标" +CAPTION "配置通知区域图标" FONT 9, "宋体", 0, 0, 0x1 BEGIN CONTROL "Tree1", IDC_NOTIFY_ICONS, "SysTreeView32", TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 193, 31 @@ -265,7 +265,7 @@ BEGIN IDS_NOTIFY_AUTOHIDE "自动隐藏" IDS_SHOW_HIDDEN_ICONS "显示隐藏的图标" IDS_HIDE_ICONS "隐藏图标" - IDS_TERMINATE "终止 ROS 浏览器" + IDS_TERMINATE "结束 ROS 浏览器" END STRINGTABLE @@ -286,7 +286,7 @@ BEGIN IDS_DESKTOPBAR_SETTINGS "桌面设置" IDS_DESKTOP "桌面" IDS_TASKBAR "任务栏" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" + IDS_NAMECOLUMN "名称" + IDS_PATHCOLUMN "路径" + IDS_MENUCOLUMN "菜单路径" END

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceList: Implement the enumeration of service device instances.
by Eric Kohl 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66e4dbc7ed1dd3533c9f6… commit 66e4dbc7ed1dd3533c9f67ba83dc8a675fe9ceb8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 31 21:37:48 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 31 21:38:26 2018 +0100 [UMPNPMGR] PNP_GetDeviceList: Implement the enumeration of service device instances. --- base/services/umpnpmgr/umpnpmgr.c | 111 +++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 11911cbb11..656a89d0bb 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -587,7 +587,115 @@ GetServiceInstanceList( _Inout_ PWSTR pszBuffer, _Inout_ PDWORD pulLength) { - return CR_CALL_NOT_IMPLEMENTED; + WCHAR szPathBuffer[512]; + WCHAR szName[16]; + HKEY hServicesKey = NULL, hServiceKey = NULL, hEnumKey = NULL; + DWORD dwValues, dwSize, dwIndex, dwUsedLength, dwPathLength; + DWORD dwError; + PWSTR pPtr; + CONFIGRET ret = CR_SUCCESS; + + /* Open the device key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the services key (Error %lu)\n", dwError); + return CR_REGISTRY_ERROR; + } + + dwError = RegOpenKeyExW(hServicesKey, + pszService, + 0, + KEY_READ, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the service key (Error %lu)\n", dwError); + ret = CR_REGISTRY_ERROR; + goto Done; + } + + dwError = RegOpenKeyExW(hServiceKey, + L"Enum", + 0, + KEY_READ, + &hEnumKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the service enum key (Error %lu)\n", dwError); + ret = CR_REGISTRY_ERROR; + goto Done; + } + + /* Retrieve the number of device instances */ + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hEnumKey, + L"Count", + NULL, + NULL, + (LPBYTE)&dwValues, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + DPRINT("RegQueryValueExW failed (Error %lu)\n", dwError); + dwValues = 1; + } + + DPRINT("dwValues %lu\n", dwValues); + + dwUsedLength = 0; + pPtr = pszBuffer; + + for (dwIndex = 0; dwIndex < dwValues; dwIndex++) + { + wsprintf(szName, L"%lu", dwIndex); + + dwSize = sizeof(szPathBuffer); + dwError = RegQueryValueExW(hEnumKey, + szName, + NULL, + NULL, + (LPBYTE)szPathBuffer, + &dwSize); + if (dwError != ERROR_SUCCESS) + break; + + DPRINT("Path: %S\n", szPathBuffer); + + dwPathLength = wcslen(szPathBuffer) + 1; + if (dwUsedLength + dwPathLength + 1 > *pulLength) + { + ret = CR_BUFFER_SMALL; + break; + } + + wcscpy(pPtr, szPathBuffer); + dwUsedLength += dwPathLength; + pPtr += dwPathLength; + + *pPtr = UNICODE_NULL; + } + +Done: + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + if (hServicesKey != NULL) + RegCloseKey(hServicesKey); + + if (ret == CR_SUCCESS) + *pulLength = dwUsedLength + 1; + else + *pulLength = 0; + + return ret; } @@ -824,7 +932,6 @@ PNP_GetDeviceList( ret = GetServiceInstanceList(pszFilter, Buffer, pulLength); - ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) {

1 0

[reactos] 01/01: [CONTRIBUTING] Add a notice for how to set your real name/mail (#1197)
by Bișoc George 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a825774096fb0f9eb50cf… commit a825774096fb0f9eb50cf3718d19a85eba982109 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Dec 31 21:31:32 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 31 21:31:32 2018 +0100 [CONTRIBUTING] Add a notice for how to set your real name/mail (#1197) Instead of posting the links each time, they'll be posted on README for future notice. --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9033d2971..fc1f21b188 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,6 +71,8 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or - *Respect our __[Coding Style]__ and __[Programming Guidelines]__.* - *Do not be afraid to ask questions.* Ask our developers on JIRA or [IRC] channel. +To amend your commit with your name and e-mail (in any case you've forgot to set your name/e-mail) please take a look at this [guide](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Amending_your_commi…. To set your name/e-mail globally for future commits that you push, [read this](https://reactos.org/wiki/ReactOS_Git_For_Dummies#Assign_commits_with_…. + ## Where To Start? Finding a good project to start with can be a challenge, because when starting out you are (usually) not aware of all the possibilities. To help you find a project, here are some ideas to try:

1 0

[reactos] 01/01: [MPLAY32] Accept paths with double quotes from command-line (#1210)
by Stanislav Motylkov 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccbc73ac933405c6238a3… commit ccbc73ac933405c6238a3c803940f9b2bb0bfeb7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Dec 31 23:29:58 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 31 21:29:58 2018 +0100 [MPLAY32] Accept paths with double quotes from command-line (#1210) CORE-15525 --- base/applications/mplay32/mplay32.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index e5299cb539..2b70c1d0de 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -12,6 +12,12 @@ #define MAIN_WINDOW_MIN_WIDTH 250 #define MAX_MCISTR 256 +#ifdef UNICODE +#define argv __wargv +#else +#define argv __argv +#endif + HINSTANCE hInstance = NULL; HWND hTrackBar = NULL; HWND hToolBar = NULL; @@ -1537,7 +1543,14 @@ _tWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdShow) ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - OpenMediaFile(hwnd, lpCmdLine, NULL); + if (*lpCmdLine == _T('"')) + { + OpenMediaFile(hwnd, argv[1], NULL); + } + else + { + OpenMediaFile(hwnd, lpCmdLine, NULL); + } /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0))

1 0

[reactos] 01/01: [WIN32K] Deny deviceless calls to EngDeviceIoControl
by Pierre Schweitzer 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01b580d8760be6870964e… commit 01b580d8760be6870964ecd7b18ae2fab5fa250f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 31 20:33:59 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 20:35:17 2018 +0100 [WIN32K] Deny deviceless calls to EngDeviceIoControl This fixes BSOD happening in ntoskrnl coming from win32k under certain conditions with 3rd party display drivers (such as VBox or VMware) --- win32ss/gdi/eng/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 0123a2713c..6d20e30de5 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -485,6 +485,11 @@ EngDeviceIoControl( TRACE("EngDeviceIoControl() called\n"); + if (!hDevice) + { + return ERROR_INVALID_HANDLE; + } + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); DeviceObject = (PDEVICE_OBJECT) hDevice;

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceListSize: Implement the buffer size calculation for the enumeration of services instances.
by Eric Kohl 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5da008c33837c03c1c186… commit 5da008c33837c03c1c186604aff1b6aec462bfb8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 31 16:14:04 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 31 16:15:16 2018 +0100 [UMPNPMGR] PNP_GetDeviceListSize: Implement the buffer size calculation for the enumeration of services instances. --- base/services/umpnpmgr/umpnpmgr.c | 116 +++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index e7d1d42bdf..11911cbb11 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -580,6 +580,17 @@ GetRelationsInstanceList( } +static +CONFIGRET +GetServiceInstanceList( + _In_ PWSTR pszService, + _Inout_ PWSTR pszBuffer, + _Inout_ PDWORD pulLength) +{ + return CR_CALL_NOT_IMPLEMENTED; +} + + static CONFIGRET GetDeviceInstanceList( @@ -810,6 +821,9 @@ PNP_GetDeviceList( } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { + ret = GetServiceInstanceList(pszFilter, + Buffer, + pulLength); ret = CR_CALL_NOT_IMPLEMENTED; } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) @@ -892,6 +906,105 @@ GetRelationsInstanceListSize( } +static +CONFIGRET +GetServiceInstanceListSize( + _In_ PWSTR pszService, + _Out_ PDWORD pulLength) +{ + HKEY hServicesKey = NULL, hServiceKey = NULL, hEnumKey = NULL; + DWORD dwValues, dwMaxValueLength, dwSize; + DWORD dwError; + CONFIGRET ret = CR_SUCCESS; + + /* Open the device key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the services key (Error %lu)\n", dwError); + return CR_REGISTRY_ERROR; + } + + dwError = RegOpenKeyExW(hServicesKey, + pszService, + 0, + KEY_READ, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the service key (Error %lu)\n", dwError); + ret = CR_REGISTRY_ERROR; + goto Done; + } + + dwError = RegOpenKeyExW(hServiceKey, + L"Enum", + 0, + KEY_READ, + &hEnumKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("Failed to open the service enum key (Error %lu)\n", dwError); + ret = CR_REGISTRY_ERROR; + goto Done; + } + + /* Retrieve the number of device instances */ + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hEnumKey, + L"Count", + NULL, + NULL, + (LPBYTE)&dwValues, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + DPRINT("RegQueryValueExW failed (Error %lu)\n", dwError); + dwValues = 1; + } + + /* Retrieve the maximum instance name length */ + dwError = RegQueryInfoKeyW(hEnumKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwMaxValueLength, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT("RegQueryInfoKeyW failed (Error %lu)\n", dwError); + dwMaxValueLength = MAX_DEVICE_ID_LEN; + } + + DPRINT("dwValues %lu dwMaxValueLength %lu\n", dwValues, dwMaxValueLength / sizeof(WCHAR)); + + /* Return the largest possible buffer size */ + *pulLength = dwValues * dwMaxValueLength / sizeof(WCHAR) + 2; + +Done: + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + + if (hServicesKey != NULL) + RegCloseKey(hServicesKey); + + return ret; +} + + static CONFIGRET GetDeviceInstanceListSize( @@ -1080,7 +1193,8 @@ PNP_GetDeviceListSize( } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { - ret = CR_CALL_NOT_IMPLEMENTED; + ret = GetServiceInstanceListSize(pszFilter, + pulLength); } else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR) {

1 0

[reactos] 01/01: [ZLIB] Import upstream commit 38e8ce32afbaa82f67d992b9f3056f281fe69259:
by Hervé Poussineau 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1790125631855c24fbf8… commit a1790125631855c24fbf8a4b7dade4f17945006f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 31 14:23:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 14:23:59 2018 +0100 [ZLIB] Import upstream commit 38e8ce32afbaa82f67d992b9f3056f281fe69259: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). --- sdk/lib/3rdparty/zlib/deflate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/zlib/deflate.c b/sdk/lib/3rdparty/zlib/deflate.c index 1ec761448d..d32007fa41 100644 --- a/sdk/lib/3rdparty/zlib/deflate.c +++ b/sdk/lib/3rdparty/zlib/deflate.c @@ -190,8 +190,11 @@ local const config configuration_table[10] = { * prev[] will be initialized on the fly. */ #define CLEAR_HASH(s) \ - s->head[s->hash_size-1] = NIL; \ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + do { \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, \ + (unsigned)(s->hash_size-1)*sizeof(*s->head)); \ +} while (0) /* =========================================================================== * Slide the hash table when sliding the window down (could be avoided with 32

1 0

[reactos] 01/01: [TCPIP] Don't assume the TEB is always defined
by Pierre Schweitzer 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89a4cde14a5ac1d3363a8… commit 89a4cde14a5ac1d3363a8efbca9c26c9f93f037a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 31 13:59:58 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 14:00:34 2018 +0100 [TCPIP] Don't assume the TEB is always defined Fixes the crash in kmtest:TcpIpConnect test. --- drivers/network/tcpip/tcpip/fileobjs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index 400f956034..f050a09b0c 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -396,6 +396,7 @@ NTSTATUS FileOpenAddress( PVOID Options) { PADDRESS_FILE AddrFile; + PTEB Teb; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); @@ -429,7 +430,12 @@ NTSTATUS FileOpenAddress( AddrFile->BCast = 1; AddrFile->HeaderIncl = 1; AddrFile->ProcessId = PsGetCurrentProcessId(); - AddrFile->SubProcessTag = ((PTEB)PsGetCurrentThreadTeb())->SubProcessTag; + + Teb = PsGetCurrentThreadTeb(); + if (Teb != NULL) { + AddrFile->SubProcessTag = Teb->SubProcessTag; + } + KeQuerySystemTime(&AddrFile->CreationTime); /* Make sure address is a local unicast address or 0 */

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceList/PNP_GetDeviceListSize: Move device relations code into separate functions.
by Eric Kohl 31 Dec '18

31 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccb8c906b076f6316b05b… commit ccb8c906b076f6316b05beaa981e815b3c127278 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 31 11:20:30 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 31 11:21:17 2018 +0100 [UMPNPMGR] PNP_GetDeviceList/PNP_GetDeviceListSize: Move device relations code into separate functions. --- base/services/umpnpmgr/umpnpmgr.c | 178 +++++++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 70 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 2420a47a85..e7d1d42bdf 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -529,6 +529,57 @@ PNP_EnumerateSubKeys( } +static +CONFIGRET +GetRelationsInstanceList( + _In_ PWSTR pszDevice, + _In_ DWORD ulFlags, + _Inout_ PWSTR pszBuffer, + _Inout_ PDWORD pulLength) +{ + PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; + NTSTATUS Status; + CONFIGRET ret = CR_SUCCESS; + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pszDevice); + + if (ulFlags & CM_GETIDLIST_FILTER_BUSRELATIONS) + { + PlugPlayData.Relations = 3; + } + else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) + { + PlugPlayData.Relations = 2; + } + else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) + { + PlugPlayData.Relations = 1; + } + else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) + { + PlugPlayData.Relations = 0; + } + + PlugPlayData.BufferSize = *pulLength * sizeof(WCHAR); + PlugPlayData.Buffer = pszBuffer; + + Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); + if (NT_SUCCESS(Status)) + { + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); + } + else + { + ret = NtStatusToCrError(Status); + } + + return ret; +} + + static CONFIGRET GetDeviceInstanceList( @@ -729,12 +780,10 @@ PNP_GetDeviceList( PNP_RPC_STRING_LEN *pulLength, DWORD ulFlags) { - PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; WCHAR szEnumerator[MAX_DEVICE_ID_LEN]; WCHAR szDevice[MAX_DEVICE_ID_LEN]; WCHAR szInstance[MAX_DEVICE_ID_LEN]; CONFIGRET ret = CR_SUCCESS; - NTSTATUS Status; DPRINT("PNP_GetDeviceList() called\n"); @@ -754,39 +803,10 @@ PNP_GetDeviceList( CM_GETIDLIST_FILTER_REMOVALRELATIONS | CM_GETIDLIST_FILTER_EJECTRELATIONS)) { - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - pszFilter); - if (ulFlags & CM_GETIDLIST_FILTER_BUSRELATIONS) - { - PlugPlayData.Relations = 3; - } - else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) - { - PlugPlayData.Relations = 2; - } - else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) - { - PlugPlayData.Relations = 1; - } - else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) - { - PlugPlayData.Relations = 0; - } - - PlugPlayData.BufferSize = *pulLength * sizeof(WCHAR); - PlugPlayData.Buffer = Buffer; - - Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); - if (NT_SUCCESS(Status)) - { - *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); - } - else - { - ret = NtStatusToCrError(Status); - } + ret = GetRelationsInstanceList(pszFilter, + ulFlags, + Buffer, + pulLength); } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) { @@ -822,6 +842,56 @@ PNP_GetDeviceList( } +static +CONFIGRET +GetRelationsInstanceListSize( + _In_ PWSTR pszDevice, + _In_ DWORD ulFlags, + _Inout_ PDWORD pulLength) +{ + PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; + NTSTATUS Status; + CONFIGRET ret = CR_SUCCESS; + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pszDevice); + + if (ulFlags & CM_GETIDLIST_FILTER_BUSRELATIONS) + { + PlugPlayData.Relations = 3; + } + else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) + { + PlugPlayData.Relations = 2; + } + else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) + { + PlugPlayData.Relations = 1; + } + else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) + { + PlugPlayData.Relations = 0; + } + + PlugPlayData.BufferSize = 0; + PlugPlayData.Buffer = NULL; + + Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); + if (NT_SUCCESS(Status)) + { + *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); + } + else + { + ret = NtStatusToCrError(Status); + } + + return ret; +} + + static CONFIGRET GetDeviceInstanceListSize( @@ -978,12 +1048,10 @@ PNP_GetDeviceListSize( PNP_RPC_BUFFER_SIZE *pulLength, DWORD ulFlags) { - PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData; WCHAR szEnumerator[MAX_DEVICE_ID_LEN]; WCHAR szDevice[MAX_DEVICE_ID_LEN]; WCHAR szInstance[MAX_DEVICE_ID_LEN]; CONFIGRET ret = CR_SUCCESS; - NTSTATUS Status; DPRINT("PNP_GetDeviceListSize(%p %S %p 0x%lx)\n", hBinding, pszFilter, pulLength, ulFlags); @@ -1006,39 +1074,9 @@ PNP_GetDeviceListSize( CM_GETIDLIST_FILTER_REMOVALRELATIONS | CM_GETIDLIST_FILTER_EJECTRELATIONS)) { - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - pszFilter); - if (ulFlags & CM_GETIDLIST_FILTER_BUSRELATIONS) - { - PlugPlayData.Relations = 3; - } - else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS) - { - PlugPlayData.Relations = 2; - } - else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS) - { - PlugPlayData.Relations = 1; - } - else if (ulFlags & CM_GETIDLIST_FILTER_EJECTRELATIONS) - { - PlugPlayData.Relations = 0; - } - - PlugPlayData.BufferSize = 0; - PlugPlayData.Buffer = NULL; - - Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA)); - if (NT_SUCCESS(Status)) - { - *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR); - } - else - { - ret = NtStatusToCrError(Status); - } + ret = GetRelationsInstanceListSize(pszFilter, + ulFlags, + pulLength); } else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE) {

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 December 2018