Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [SHELL32][SDK] Implement SHCreatePropertyBag (#5541)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea97c4890985044d61e01… commit ea97c4890985044d61e011c7416f5b9e61d724c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 7 17:02:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 7 17:02:39 2023 +0900 [SHELL32][SDK] Implement SHCreatePropertyBag (#5541) - Implement SHCreatePropertyBag function in utils.cpp. - Add its prototype to <undocshell.h>. CORE-9283 --- dll/win32/shell32/stubs.cpp | 12 ------------ dll/win32/shell32/utils.cpp | 10 ++++++++++ sdk/include/reactos/undocshell.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index bc8bf50f7b5..c25d4cb1fc1 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -180,18 +180,6 @@ SHMultiFileProperties(IDataObject *pDataObject, DWORD dwFlags) return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C HRESULT -WINAPI -SHCreatePropertyBag(REFIID refIId, LPVOID *lpUnknown) -{ - /* Call SHCreatePropertyBagOnMemory() from shlwapi.dll */ - FIXME("SHCreatePropertyBag() stub\n"); - return E_FAIL; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index c2085b9c1e0..e59af7f7350 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,6 +9,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/************************************************************************* + * SHCreatePropertyBag (SHELL32.715) + */ +EXTERN_C HRESULT +WINAPI +SHCreatePropertyBag(_In_ REFIID riid, _Out_ void **ppvObj) +{ + return SHCreatePropertyBagOnMemory(STGM_READWRITE, riid, ppvObj); +} + /************************************************************************* * SheRemoveQuotesA (SHELL32.@) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 0b2b247f668..370fef7377e 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -646,8 +646,8 @@ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey); #define SMC_EXEC 4 INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); +HRESULT WINAPI SHCreatePropertyBag(_In_ REFIID riid, _Out_ void **ppvObj); HRESULT WINAPI SHLimitInputCombo(HWND hWnd, IShellFolder *psf); - HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv); BOOL WINAPI GUIDFromStringW(

1 year, 1 month

[reactos] 01/01: [SHELL32][SDK] Implement SHIsTempDisplayMode (#5523)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63fae07d12791d45f6924… commit 63fae07d12791d45f6924cf063d7285254e25ddf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 7 09:50:30 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 7 09:50:30 2023 +0900 [SHELL32][SDK] Implement SHIsTempDisplayMode (#5523) CORE-9277 --- dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp | 30 ++++++++++++++++++++++ dll/win32/shell32/stubs.cpp | 11 -------- sdk/include/reactos/undocshell.h | 2 ++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp index 3e45650e9c6..95327468757 100644 --- a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp +++ b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp @@ -520,3 +520,33 @@ BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) return TRUE; } + +/************************************************************************* + * SHIsTempDisplayMode [SHELL32.724] + * + * Is the current display settings temporary? + */ +EXTERN_C BOOL WINAPI SHIsTempDisplayMode(VOID) +{ + TRACE("\n"); + + if (GetSystemMetrics(SM_REMOTESESSION) || GetSystemMetrics(SM_REMOTECONTROL)) + return FALSE; + + DEVMODEW DevMode; + ZeroMemory(&DevMode, sizeof(DevMode)); + DevMode.dmSize = sizeof(DevMode); + + if (!EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &DevMode)) + return FALSE; + + if (!DevMode.dmPelsWidth || !DevMode.dmPelsHeight) + return FALSE; + + HDC hDC = GetDC(NULL); + DWORD cxWidth = GetDeviceCaps(hDC, HORZRES); + DWORD cyHeight = GetDeviceCaps(hDC, VERTRES); + ReleaseDC(NULL, hDC); + + return (cxWidth != DevMode.dmPelsWidth || cyHeight != DevMode.dmPelsHeight); +} diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index f3c79305971..bc8bf50f7b5 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -130,17 +130,6 @@ GetFileDescriptor(FILEGROUPDESCRIPTOR *pFileGroupDesc, BOOL bUnicode, INT iIndex return NULL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHIsTempDisplayMode(VOID) -{ - FIXME("SHIsTempDisplayMode() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 1d87844e1a9..0b2b247f668 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -189,6 +189,8 @@ DWORD WINAPI SHNetConnectionDialog( LPCWSTR lpstrRemoteName, DWORD dwType); +BOOL WINAPI SHIsTempDisplayMode(VOID); + /**************************************************************************** * Cabinet Window Messages */

1 year, 1 month

[reactos] 01/01: [APPWIZ] CORE-5737: Move focus before SW_HIDE (#5536)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6d264e4f0c47379ad2b9… commit a6d264e4f0c47379ad2b9caf7dc411c9bf94da48 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 7 09:48:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 7 09:48:50 2023 +0900 [APPWIZ] CORE-5737: Move focus before SW_HIDE (#5536) Arrow keys were not working. - Move focus before SW_HIDE. - Swap ID_DWL_INSTALL and IDCANCEL controls. CORE-5737 --- dll/cpl/appwiz/addons.c | 10 ++++++++-- dll/cpl/appwiz/lang/bg-BG.rc | 4 ++-- dll/cpl/appwiz/lang/cs-CZ.rc | 4 ++-- dll/cpl/appwiz/lang/de-DE.rc | 4 ++-- dll/cpl/appwiz/lang/el-GR.rc | 4 ++-- dll/cpl/appwiz/lang/en-US.rc | 4 ++-- dll/cpl/appwiz/lang/es-ES.rc | 4 ++-- dll/cpl/appwiz/lang/et-EE.rc | 4 ++-- dll/cpl/appwiz/lang/fr-FR.rc | 4 ++-- dll/cpl/appwiz/lang/he-IL.rc | 4 ++-- dll/cpl/appwiz/lang/hu-HU.rc | 4 ++-- dll/cpl/appwiz/lang/id-ID.rc | 4 ++-- dll/cpl/appwiz/lang/it-IT.rc | 4 ++-- dll/cpl/appwiz/lang/ja-JP.rc | 4 ++-- dll/cpl/appwiz/lang/no-NO.rc | 4 ++-- dll/cpl/appwiz/lang/pl-PL.rc | 4 ++-- dll/cpl/appwiz/lang/pt-BR.rc | 4 ++-- dll/cpl/appwiz/lang/pt-PT.rc | 4 ++-- dll/cpl/appwiz/lang/ro-RO.rc | 4 ++-- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- dll/cpl/appwiz/lang/sk-SK.rc | 4 ++-- dll/cpl/appwiz/lang/sq-AL.rc | 4 ++-- dll/cpl/appwiz/lang/tr-TR.rc | 4 ++-- dll/cpl/appwiz/lang/uk-UA.rc | 4 ++-- dll/cpl/appwiz/lang/zh-CN.rc | 4 ++-- dll/cpl/appwiz/lang/zh-HK.rc | 4 ++-- dll/cpl/appwiz/lang/zh-TW.rc | 4 ++-- 27 files changed, 60 insertions(+), 54 deletions(-) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index d2170688408..5fdfc999f1e 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -393,10 +393,16 @@ static DWORD WINAPI download_proc(PVOID arg) static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - HWND hwndInstallButton; + HWND hwndProgress, hwndInstallButton; switch(msg) { case WM_INITDIALOG: - ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); + hwndProgress = GetDlgItem(hwnd, ID_DWL_PROGRESS); + + /* CORE-5737: Move focus before SW_HIDE */ + if (hwndProgress == GetFocus()) + SendMessageW(hwnd, WM_NEXTDLGCTL, 0, FALSE); + + ShowWindow(hwndProgress, SW_HIDE); install_dialog = hwnd; return TRUE; diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index b472e7b75de..2ca81ca7306 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index 60e7acd2dd4..e03f52666b2 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -66,8 +66,8 @@ BEGIN CONTROL "ReactOS nenalezl balíček Wine Gecko nutný k tomu, aby aplikace zapouzdřující HTML fungovaly správně. ReactOS jej může automaticky stáhnout a nainstalovat.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Instalovat", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Storno", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalovat", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index 7a1b2508e15..07f78bc33f5 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS konnte kein Gecko-Paket finden, welches für die korrekte Ausführung von Anwendungen mit eingebettetem HTML benötigt wird. ReactOS kann es automatisch für Sie herunterladen und installieren.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 8669a85588d..6d1b0fcb7d8 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 29c51714a0c..1c4be80aef3 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 23cb4c36f58..5f59afb626c 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -71,8 +71,8 @@ BEGIN CONTROL "ReactOS no pudo encontrar el paquete de Wine Gecko, necesario para que las aplicaciones con HTML embebido funcionen correctamente.\n\nReactOS puede ayudar a descargarlo de forma automática y fácil.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancelar", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 4d9825e3ec9..a17534fb4e8 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -68,8 +68,8 @@ BEGIN CONTROL "ReactOS ei leidnud Wine Gecko paketti, mille abil saavad rakendused HTMLi korralikult kasutada. ReactOS saab selle automaatselt paigaldada ja alla laadida.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Paigalda", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Loobu", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Paigalda", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "&Loobu", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index c304ac8f323..731283c04f2 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS n'a trouvé aucun paquet Wine Gecko nécessaire pour pouvoir exécuter correctement les applications incluant du code HTML. ReactOS est capable de télécharger et d'installer automatiquement le paquet pour vous.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Annuler", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index c0a1628ba01..01a4ce72301 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -62,8 +62,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc index c2f868fafd3..ed58f785006 100644 --- a/dll/cpl/appwiz/lang/hu-HU.rc +++ b/dll/cpl/appwiz/lang/hu-HU.rc @@ -65,8 +65,8 @@ BEGIN CONTROL "A ReactOS nem találja a Wine Gecko csomagot, ami a HTML-t beágyazó alkalmazások működéséhez szükséges. Ezt a ReactOS automatikusan le tudja tölteni és telepíteni.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Telepítés", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Mégse", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Telepítés", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 2992561f292..83e4a0f7931 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS tidak bisa menemukan paket Wine Gecko yang dibutuhkan untuk aplikasi pengimplementasi HTML bekerja dengan baik. ReactOS bisa secara otomatis mengunduh dan memasang unduk anda.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Pasang", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Batal", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Pasang", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Batal", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index ed400f1523c..ab8e9cddf4c 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS non ha trovato il pacchetto Wine Gecko necessario per il corretto funzionamento delle applicazioni che incorporano HTML. ReactOS puo scaricarlo e installarlo automaticamente.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Annulla", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index a8e93c6b894..6455621ba13 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -61,8 +61,8 @@ BEGIN 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 - PUSHBUTTON "キャンセル", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "インストール(&I)", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 7719769826b..dc5c660ba6d 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index bdd2a0cf284..248269f30a8 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -72,8 +72,8 @@ BEGIN CONTROL "System ReactOS nie mógł odnaleźć pakietu Wine Gecko, który jest potrzebny dla aplikacji osadzających kod HTML, aby mogły poprawnie działać. System ReactOS może automatycznie pobrać i zainstalować ten pakiet dla Ciebie.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 35 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 48, 240, 12 - DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index e3165c75d30..c21d9eaeb58 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -63,8 +63,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index 4e03e1cc06f..d0cf672158a 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -63,8 +63,8 @@ BEGIN CONTROL "O ReactOS não consegue encontrar o pacote Wine Gecko que é necessário para que as aplicações HTML funcionem correctamente. O ReactOS pode fazer o download automático e instalar por si.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 7de4688abb6..adfa7b3447e 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -69,8 +69,8 @@ BEGIN CONTROL "Pachetul Wine Gecko, necesar pentru funcționarea corectă a aplicațiilor cu HTML încorporat, nu este există local. ReactOS permite totuși descărcarea și instalarea automată a acestuia.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "Instalea&ză", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&nulează", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Instalea&ză", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "A&nulează", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 25a825bd639..75fafc51b51 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -61,8 +61,8 @@ BEGIN CONTROL "ReactOS не может найти Wine Gecko пакет, который необходим для приложений с поддержкой HTML, чтобы работать правильно. 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 "&Установить", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Отмена", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 1e85530000e..aaca7a01487 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -65,8 +65,8 @@ BEGIN CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index f0598c3aef3..b6dbbc3aa5d 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -65,8 +65,8 @@ BEGIN CONTROL "ReactOS nuk mund të gjej një paketë Wine Gecko e cila është e nevojshme për aplikimet e ngulura HTML të funksionoj në rregull. ReactOS mund ta shkarkoje automatikisht dhe ta instalojë për ju.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Instalo", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Anulo", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalo", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index f9d5e06ce50..745f690df08 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -63,8 +63,8 @@ BEGIN CONTROL "ReactOS, HTML gömülü uygulamaların düzgün çalışması için gereken bir Wine Gecko paketi bulamadı. ReactOS, sizin için onu, otomatik indirebilir ve kurabilir.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "İptal", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "İptal", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index bdcdc9d45ba..bebed612638 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -69,8 +69,8 @@ BEGIN CONTROL "ReactOS не може знайти Wine Gecko пакет, який необхідний для додатків з підтримкою HTML, щоб вони працювали правильно. 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 "&Встановити", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Скасувати", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Встановити", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index a1b57cfbbf1..c3b99c5dc7a 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -70,8 +70,8 @@ BEGIN 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 - PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "安装(&I)", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc index 5f32adf1dbd..1baeb03850c 100644 --- a/dll/cpl/appwiz/lang/zh-HK.rc +++ b/dll/cpl/appwiz/lang/zh-HK.rc @@ -69,8 +69,8 @@ BEGIN CONTROL "ReactOS 找不到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。\nReactOS 能為您自動下載並安裝。", 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 - PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 413ae7285bd..a4bd7485c1f 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -70,8 +70,8 @@ BEGIN CONTROL "ReactOS 無法找到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。\nReactOS 能為您自動下載並安裝。", 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 - PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 144, 76, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14 END STRINGTABLE

1 year, 1 month

[reactos] 01/01: [GDI32] CreateDIBSection: Remove erroneous assignation (#5502)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4c48945643460fca2732… commit e4c48945643460fca273217b75f3e7b72bb3ed7a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 30 14:56:10 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 6 17:35:23 2023 +0200 [GDI32] CreateDIBSection: Remove erroneous assignation (#5502) bmBits is only used and assigned on output. It points (holds the address) to the array of DIB bit values. The "Bits" parameter is however a pointer to a variable that will receive the address of that array. So it makes no sense to initially assign bmBits to the value of the Bits parameter... --- win32ss/gdi/gdi32/objects/bitmap.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index 5fbcf50568a..343b2b55bd0 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -255,34 +255,36 @@ CreateDIBSection( HBITMAP hBitmap = NULL; PVOID bmBits = NULL; - pConvertedInfo = ConvertBitmapInfo(BitmapInfo, Usage, &ConvertedInfoSize, - FALSE); - + pConvertedInfo = ConvertBitmapInfo(BitmapInfo, + Usage, + &ConvertedInfoSize, + FALSE); if (pConvertedInfo) { // Verify header due to converted may == info. if (pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) { - if (pConvertedInfo->bmiHeader.biCompression == BI_JPEG - || pConvertedInfo->bmiHeader.biCompression == BI_PNG) + if (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } } - bmBits = Bits; - hBitmap = NtGdiCreateDIBSection(hDC, hSection, dwOffset, pConvertedInfo, Usage, - ConvertedInfoSize, 0, // fl - 0, // dwColorSpace - &bmBits); + hBitmap = NtGdiCreateDIBSection(hDC, + hSection, + dwOffset, + pConvertedInfo, + Usage, + ConvertedInfoSize, + 0, // fl + 0, // dwColorSpace + &bmBits); + if (!hBitmap) + bmBits = NULL; if (BitmapInfo != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); - - if (!hBitmap) - { - bmBits = NULL; - } } if (Bits)

1 year, 1 month

[reactos] 03/03: [SDK:ASM][NDK] Adjust the x86 definition of PCR (for UP and MP).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9632235a377298a420654… commit 9632235a377298a420654c6def3e36b8b9b78b5d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 16 23:43:25 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 6 17:29:06 2023 +0200 [SDK:ASM][NDK] Adjust the x86 definition of PCR (for UP and MP). --- sdk/include/asm/ks386.template.h | 5 +++++ sdk/include/ndk/i386/asm.h | 1 + 2 files changed, 6 insertions(+) diff --git a/sdk/include/asm/ks386.template.h b/sdk/include/asm/ks386.template.h index cf581712b17..25cae3c4b15 100644 --- a/sdk/include/asm/ks386.template.h +++ b/sdk/include/asm/ks386.template.h @@ -556,7 +556,12 @@ SIZE(XsaHeaderLength, XSAVE_AREA_HEADER), HEADER("Data access macros"), RAW("#define USERDATA ds:[HEX(0FFDF0000)]"), +RAW("#ifdef CONFIG_SMP"), RAW("#define PCR fs:"), +RAW("#else"), +/* Address at KIP0PCRADDRESS */ +RAW("#define PCR ds:[HEX(0FFDFF000)]"), +RAW("#endif"), #if (NTDDI_VERSION >= NTDDI_WIN8) HEADER("KNODE offsets"), diff --git a/sdk/include/ndk/i386/asm.h b/sdk/include/ndk/i386/asm.h index 57fad2bdcb3..07b756b3d30 100644 --- a/sdk/include/ndk/i386/asm.h +++ b/sdk/include/ndk/i386/asm.h @@ -27,6 +27,7 @@ Author: #ifdef CONFIG_SMP #define PCR fs: #else +/* Address at KIP0PCRADDRESS */ #define PCR ds:[0xFFDFF000] #endif #endif

1 year, 1 month

[reactos] 02/03: [SDK:ASM][NDK] Improve and synchronize the definition of the SYNCH_LEVEL symbol (#3943)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f477e0e3b1ad8e00cda3… commit 5f477e0e3b1ad8e00cda3e3a97ce0d112a1bab01 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 5 03:58:26 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 6 17:28:51 2023 +0200 [SDK:ASM][NDK] Improve and synchronize the definition of the SYNCH_LEVEL symbol (#3943) In particular, for a given platform (x86, AMD64...) its definition depends for uniprocessor vs. multiprocessor NT kernel/HAL (controlled by the CONFIG_SMP define). Regarding the ASM-generated headers (from asm/ksx.template.h), since they are generated once for a given platform, and since UP/MP NT builds are generated at the same time, these headers need to contain both SYNCH_LEVEL definitions controlled by CONFIG_SMP, instead of a fixed value. Therefore we need to employ the geninc RAW(...) construct. [NDK:X86] Add missing x86 CLOCK1_LEVEL and POWER_LEVEL definitions. --- sdk/include/asm/ksx.template.h | 11 ++++++++--- sdk/include/ndk/amd64/asm.h | 27 ++++++++++++++++++--------- sdk/include/ndk/amd64/ketypes.h | 12 ++++++++---- sdk/include/ndk/arm/ketypes.h | 8 +++++--- sdk/include/ndk/i386/asm.h | 6 ++++-- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index 35f9837242f..019232bb439 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -126,10 +126,15 @@ CONSTANT(IPI_LEVEL), CONSTANT(POWER_LEVEL), CONSTANT(PROFILE_LEVEL), CONSTANT(HIGH_LEVEL), -RAW("#ifdef NT_UP"), -{TYPE_CONSTANT, "SYNCH_LEVEL", DISPATCH_LEVEL}, + +RAW("#ifndef CONFIG_SMP"), +CONSTANTX(SYNCH_LEVEL, DISPATCH_LEVEL), RAW("#else"), -{TYPE_CONSTANT, "SYNCH_LEVEL", (IPI_LEVEL - 2)}, +#if defined(_M_IX86) && (NTDDI_VERSION < NTDDI_WS03) +CONSTANTX(SYNCH_LEVEL, (IPI_LEVEL - 1)), +#else +CONSTANTX(SYNCH_LEVEL, (IPI_LEVEL - 2)), +#endif RAW("#endif"), #if (NTDDI_VERSION >= NTDDI_WIN8) diff --git a/sdk/include/ndk/amd64/asm.h b/sdk/include/ndk/amd64/asm.h index 69f3ad2fb17..9adcc3842d1 100644 --- a/sdk/include/ndk/amd64/asm.h +++ b/sdk/include/ndk/amd64/asm.h @@ -380,15 +380,24 @@ Author: // // IRQL Levels // -#define PASSIVE_LEVEL 0 -#define LOW_LEVEL 0 -#define APC_LEVEL 1 -#define DISPATCH_LEVEL 2 -#define CLOCK_LEVEL 13 -#define IPI_LEVEL 14 -#define POWER_LEVEL 14 -#define PROFILE_LEVEL 15 -#define HIGH_LEVEL 15 +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CLOCK_LEVEL 13 +#define IPI_LEVEL 14 +#define POWER_LEVEL 14 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +// +// Synchronization-level IRQL +// +#ifndef CONFIG_SMP +#define SYNCH_LEVEL DISPATCH_LEVEL +#else +#define SYNCH_LEVEL (IPI_LEVEL - 2) +#endif // // Quantum Decrements diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 9bdb9e43bc2..e09c0a884ce 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -277,13 +277,17 @@ typedef enum // #define KSEG0_BASE 0xfffff80000000000ULL +#define NMI_STACK_SIZE 0x2000 +#define ISR_STACK_SIZE 0x6000 + // // Synchronization-level IRQL // -#define SYNCH_LEVEL 12 - -#define NMI_STACK_SIZE 0x2000 -#define ISR_STACK_SIZE 0x6000 +#ifndef CONFIG_SMP +#define SYNCH_LEVEL DISPATCH_LEVEL +#else +#define SYNCH_LEVEL (IPI_LEVEL - 2) +#endif // // Number of pool lookaside lists per pool in the PRCB diff --git a/sdk/include/ndk/arm/ketypes.h b/sdk/include/ndk/arm/ketypes.h index c047436d769..5bcac60f7d7 100644 --- a/sdk/include/ndk/arm/ketypes.h +++ b/sdk/include/ndk/arm/ketypes.h @@ -29,9 +29,6 @@ extern "C" { // -#define SYNCH_LEVEL DISPATCH_LEVEL - - // // CPU Vendors // @@ -303,6 +300,11 @@ typedef enum // #define KSEG0_BASE 0x80000000 +// +// Synchronization-level IRQL +// +#define SYNCH_LEVEL DISPATCH_LEVEL + // // Number of pool lookaside lists per pool in the PRCB // diff --git a/sdk/include/ndk/i386/asm.h b/sdk/include/ndk/i386/asm.h index 428c39734a4..57fad2bdcb3 100644 --- a/sdk/include/ndk/i386/asm.h +++ b/sdk/include/ndk/i386/asm.h @@ -577,8 +577,10 @@ Author: #define APC_LEVEL 0x1 #define DISPATCH_LEVEL 0x2 #define PROFILE_LEVEL 0x1B +#define CLOCK1_LEVEL 0x1C #define CLOCK2_LEVEL 0x1C #define IPI_LEVEL 0x1D +#define POWER_LEVEL 0x1E #define HIGH_LEVEL 0x1F // @@ -588,9 +590,9 @@ Author: #define SYNCH_LEVEL DISPATCH_LEVEL #else #if (NTDDI_VERSION < NTDDI_WS03) -#define SYNCH_LEVEL (IPI_LEVEL - 0x1) +#define SYNCH_LEVEL (IPI_LEVEL - 1) #else -#define SYNCH_LEVEL (IPI_LEVEL - 0x2) +#define SYNCH_LEVEL (IPI_LEVEL - 2) #endif #endif

1 year, 1 month

[reactos] 01/03: [SDK:ASM] OK these definition entries are #if 0'ed out, but close the parentheses anyway to not mess up with editors' code-folding functionality.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3508439480869d8cea86… commit f3508439480869d8cea86692443674d58059f1f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 16 23:28:47 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 6 17:24:41 2023 +0200 [SDK:ASM] OK these definition entries are #if 0'ed out, but close the parentheses anyway to not mess up with editors' code-folding functionality. --- sdk/include/asm/ksamd64.template.h | 86 +++++++++++++++++++------------------- sdk/include/asm/ksarm.template.h | 4 -- sdk/include/asm/ksx.template.h | 8 ++-- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index db36c5767bc..0f3a16d6209 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -758,49 +758,49 @@ OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql), OFFSET(TrFaultIndicator, KTRAP_FRAME, TrP1Home), OFFSET(TrExceptionActive, KTRAP_FRAME, TrP1Home), OFFSET(TrMxCsr, KTRAP_FRAME, TrP1Home), -OFFSET(TrRax equ 0FFFFFFB0H -OFFSET(TrRcx equ 0FFFFFFB8H -OFFSET(TrRdx equ 0FFFFFFC0H -OFFSET(TrR8 equ 0FFFFFFC8H -OFFSET(TrR9 equ 0FFFFFFD0H -OFFSET(TrR10 equ 0FFFFFFD8H -OFFSET(TrR11 equ 0FFFFFFE0H -OFFSET(TrGsBase equ 0FFFFFFE8H -OFFSET(TrGsSwap equ 0FFFFFFE8H -OFFSET(TrXmm0 equ 0FFFFFFF0H -OFFSET(TrXmm1 equ 00000H -OFFSET(TrXmm2 equ 00010H -OFFSET(TrXmm3 equ 00020H -OFFSET(TrXmm4 equ 00030H -OFFSET(TrXmm5 equ 00040H -OFFSET(TrFaultAddress equ 00050H -OFFSET(TrDr0 equ 00058H -OFFSET(TrDr1 equ 00060H -OFFSET(TrDr2 equ 00068H -OFFSET(TrDr3 equ 00070H -OFFSET(TrDr6 equ 00078H -OFFSET(TrDr7 equ 00080H -OFFSET(TrDebugControl equ 00088H -OFFSET(TrLastBranchToRip equ 00090H -OFFSET(TrLastBranchFromRip equ 00098H -OFFSET(TrLastExceptionToRip equ 000A0H -OFFSET(TrLastExceptionFromRip equ 000A8H -OFFSET(TrSegDs equ 000B0H -OFFSET(TrSegEs equ 000B2H -OFFSET(TrSegFs equ 000B4H -OFFSET(TrSegGs equ 000B6H -OFFSET(TrTrapFrame equ 000B8H -OFFSET(TrRbx equ 000C0H -OFFSET(TrRdi equ 000C8H -OFFSET(TrRsi equ 000D0H -OFFSET(TrRbp equ 000D8H -OFFSET(TrErrorCode equ 000E0H -OFFSET(TrRip equ 000E8H -OFFSET(TrSegCs equ 000F0H -OFFSET(TrLogging equ 000F3H -OFFSET(TrEFlags equ 000F8H -OFFSET(TrRsp equ 00100H -OFFSET(TrSegSs equ 00108H +OFFSET(TrRax equ 0FFFFFFB0H), +OFFSET(TrRcx equ 0FFFFFFB8H), +OFFSET(TrRdx equ 0FFFFFFC0H), +OFFSET(TrR8 equ 0FFFFFFC8H), +OFFSET(TrR9 equ 0FFFFFFD0H), +OFFSET(TrR10 equ 0FFFFFFD8H), +OFFSET(TrR11 equ 0FFFFFFE0H), +OFFSET(TrGsBase equ 0FFFFFFE8H), +OFFSET(TrGsSwap equ 0FFFFFFE8H), +OFFSET(TrXmm0 equ 0FFFFFFF0H), +OFFSET(TrXmm1 equ 00000H), +OFFSET(TrXmm2 equ 00010H), +OFFSET(TrXmm3 equ 00020H), +OFFSET(TrXmm4 equ 00030H), +OFFSET(TrXmm5 equ 00040H), +OFFSET(TrFaultAddress equ 00050H), +OFFSET(TrDr0 equ 00058H), +OFFSET(TrDr1 equ 00060H), +OFFSET(TrDr2 equ 00068H), +OFFSET(TrDr3 equ 00070H), +OFFSET(TrDr6 equ 00078H), +OFFSET(TrDr7 equ 00080H), +OFFSET(TrDebugControl equ 00088H), +OFFSET(TrLastBranchToRip equ 00090H), +OFFSET(TrLastBranchFromRip equ 00098H), +OFFSET(TrLastExceptionToRip equ 000A0H), +OFFSET(TrLastExceptionFromRip equ 000A8H), +OFFSET(TrSegDs equ 000B0H), +OFFSET(TrSegEs equ 000B2H), +OFFSET(TrSegFs equ 000B4H), +OFFSET(TrSegGs equ 000B6H), +OFFSET(TrTrapFrame equ 000B8H), +OFFSET(TrRbx equ 000C0H), +OFFSET(TrRdi equ 000C8H), +OFFSET(TrRsi equ 000D0H), +OFFSET(TrRbp equ 000D8H), +OFFSET(TrErrorCode equ 000E0H), +OFFSET(TrRip equ 000E8H), +OFFSET(TrSegCs equ 000F0H), +OFFSET(TrLogging equ 000F3H), +OFFSET(TrEFlags equ 000F8H), +OFFSET(TrRsp equ 00100H), +OFFSET(TrSegSs equ 00108H), #endif SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), diff --git a/sdk/include/asm/ksarm.template.h b/sdk/include/asm/ksarm.template.h index bfffbf01f8c..0d300d2784c 100644 --- a/sdk/include/asm/ksarm.template.h +++ b/sdk/include/asm/ksarm.template.h @@ -559,7 +559,3 @@ CONSTANT(PF_ARM_EXTERNAL_CACHE_AVAILABLE), #define KEXCEPTION_ACTIVE_EXCEPTION_FRAME 0x1 #define KEXCEPTION_ACTIVE_SERVICE_FRAME 0x2 - - - - diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index b434717f382..35f9837242f 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -926,10 +926,10 @@ OFFSET(IbWow64CfgBitMap, PS_SYSTEM_DLL_INIT_BLOCK, Wow64CfgBitMap), OFFSET(IbMitigationOptionsMap, PS_SYSTEM_DLL_INIT_BLOCK, MitigationOptionsMap), HEADER("Extended context"), -OFFSET(CxxLegacyOffset 0x8 -OFFSET(CxxLegacyLength 0xc -OFFSET(CxxXStateOffset 0x10 -OFFSET(CxxXStateLength 0x14 +OFFSET(CxxLegacyOffset 0x8), +OFFSET(CxxLegacyLength 0xc), +OFFSET(CxxXStateOffset 0x10), +OFFSET(CxxXStateLength 0x14), HEADER("Enclave call dispatch frame"), OFFSET(EcEnclaveNumber, ???, EnclaveNumber),

1 year, 1 month

[reactos] 01/01: [NET][MC] Update Romanian (ro-RO) translation for message table (#5453)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5210ad48c7295e25c7583… commit 5210ad48c7295e25c75830e1d70a1f2a9f4a5ac5 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Aug 6 14:59:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 13:59:26 2023 +0200 [NET][MC] Update Romanian (ro-RO) translation for message table (#5453) --- sdk/include/reactos/mc/net_msg.mc | 516 ++++++++++++++++++++------------------ 1 file changed, 270 insertions(+), 246 deletions(-) diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index f337465ada8..d4ef72f3ea9 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1,4 +1,5 @@ -;// Romanian translation by Ștefan Fulea (stefan dot fulea at mail dot com) +;// Romanian translation by 2011-2019 Ștefan Fulea (stefan.fulea(a)mail.com) +;// Romanian translation by 2023 Andrei Miloiu (miloiuandrei(a)gmail.com) ;// Russian translation by Kudratov Olimjon (olim98(a)bk.ru) ;// Spanish translation by Ismael Ferreras Morezuelas <2014-11-07> ;// Turkish translation by 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) @@ -187,26 +188,28 @@ NET ACCOUNTS să aibă efect. deautentificări forțate la expirarea contului sau a numărului valid de ore de autentificare. NO (implicit) previne deautentificarea forțată. -/MINPWLEN:length Sets the minimum number of characters for - a password. The range is 0-14 characters; - the default is 6 characters. -/MAXPWAGE:{days | UNLIMITED} Sets the maximum numer of days that a - password is valid. No limit is specified - by using UNLIMITED. /MAXPWAGE cannot be less - than /MINPWAGE. The range is 1-999; the - default is to leave the value unchanged. -/MINPWAGE:days Sets the minimum number of days that must - pass before a user can change a password. - A value of 0 sets no minimum time. The range - is 0-999; the default is 0 days. /MINPWAGE - cannot be more than /MAXPWAGE. -/UNIQUEPW:number Requires that a users passwords be unique - through the specified number of password - changes. The maximum value is 24. -/DOMAIN Performs the operation on a domain - controller of the current domain. Otherwise, - the operation is performed on the local - computer. +/MINPWLEN:lungime Setează numărul minim de caractere pentru + o parolă. Intervalul e de 0-14 caractere; + implicit, sunt 6 caractere. +/MAXPWAGE:{zile | UNLIMITED} Setează numărul maxim de zile pentru care o + parolă e validă. Prin parametrul UNLIMITED nu e + specificată nicio limită. Valoarea parametrului + /MAXPWAGE nu poate fi mai mică decât valoarea + parametrului /MINPWAGE. Intervalul e 1-999; + implicit înseamnă lăsarea valorii neschimbate. +/MINPWAGE:zile Setează numărul maxim de zile ce trebuie să + treacă înainte ca utilizatorul să-și schimbe + parola. Valoarea 0 nu stabilește un timp minim. + Intervalul e 0-999; valoarea implică e de 0 + zile. Valoarea parametrului /MINPWAGE nu poate + fi mai mare decât valoarea parametrului + /MAXPWAGE. +/UNIQUEPW:număr Necesită ca parolele utilizatorilor să fie unice + prin numărul de schimbări de parolă specificate. + Valoarea maximă e 24. +/DOMAIN Efectuează operația pe un controlor de domeniu + al domeniului curent. Altfel, operațiunea este + efectuată la calculatorul local. NET HELP comandă | MORE (pentru afișare paginată). . @@ -438,7 +441,7 @@ Language=Polish NET COMPUTER \\nazwa_komputera {/ADD | /DEL} . Language=Romanian -NET COMPUTER \\computername {/ADD | /DEL} +NET COMPUTER \\numele calculatorului {/ADD | /DEL} . Language=Russian NET COMPUTER \\computername {/ADD | /DEL} @@ -480,13 +483,15 @@ To polecenie jest dostępne tylko na serwerowych systemach opoeracyjnych. /DEL Usuwa określony komputer z domeny. . Language=Romanian -NET COMPUTER adds or deletes computers from a domain database. This -command is available only on server operating systems. +NET COMPUTER adaugă sau șterge calculatoare dintr-o bază de date a unui +domeniu. Această comandă este disponibilă numai pentru sistemele de operare +pentru servitoare. -\\computername Specifies the computer to add or delete from - the domain. -/ADD Adds the specified computer to the domain. -/DEL Removes the specified computer from the domain. +\\numele calculatorului + Specifică ce calculator trebuie adăugat sau șters din + domeniu. +/ADD Adaugă calculatorul specificat în domeniu. +/DEL Șterge calculatorul specificat din domeniu. . Language=Russian NET COMPUTER adds or deletes computers from a domain database. This @@ -594,15 +599,15 @@ WORKSTATION Wyświetla informacje o konfiguracji usługi Stacja robocza. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET CONFIG displays coniguration information of the Workstation or -Server service. When used without the WORKSTATION or SERVER switch, -it displays a list of configurable services. To get help with -configuring a service, type NET HELP CONFIG service. +NET CONFIG afișează informații de configurații ale serviciului stației de lucru +sau a servitorului. Când este folosit fără comutatorul stației de lucru sau +servitorului, se afișează a listă a serviciilor configurabile. Pentru a obține +ajutor legat de configurarea unui serviciu, tastați serviciul NET HELP CONFIG. -SERVER Displays information about the configuration of the - Server service. -WORKSTATION Displays information about the configuration of the - Workstation service. +SERVER Afișează informații despre configurarea + serviciului servitorului. +WORKSTATION Afișează informații despre configurarea + serviciului stației de lucru. NET HELP comandă | MORE (pentru afișare paginată). . @@ -686,7 +691,7 @@ NET CONFIG SERVER [/AUTODISCONNECT:czas] [/SRVCOMMENT:"tekst"] [/HIDDEN:{YES | NO}] . Language=Romanian -NET CONFIG SERVER [/AUTODISCONNECT:time] [/SRVCOMMENT:"text"] +NET CONFIG SERVER [/AUTODISCONNECT:timp] [/SRVCOMMENT:"text"] [/HIDDEN:{YES | NO}] . Language=Russian @@ -757,22 +762,22 @@ wpisz NET CONFIG SERVER bez parametrów. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET CONFIG SERVER displays or changes settings for the Server service. - -/AUTODISCONNECT:time Sets the maximum number of minutes a user's - session can be inactive before it is disconected. - You can specify -1 to never disconnect. The range - is -1-65535 minutes; the default is 15. -/SRVCOMMENT:"text" Adds a comment for the server that is displayed on - screen and with the NET VIEW command. - Enclose the text in quotation marks. -/HIDDEN:{YES | NO} Specifies whether the server's computer name - appears on displays listings of servers. Note that - hiding a serverdoes not alter the permissions - on that server. The default is NO. - -To display the current configuration for the Server service, -type NET CONFIG SERVER without parameters. +NET CONFIG SERVER afișează sau schimbă configurații pentru serviciul + servitorului. +/AUTODISCONNECT:timp Setează numărul maxim de minute ale unei sesiuni a + utilizatorului ce poate fi inactivă înainte de a fi + deconectată. Puteți specifica -1 pentru a nu o deconecta niciodată. + Intervalul este de -1-65535 (de) minute; valoare implicită este 15. +/SRVCOMMENT:"text" Adaugă un comentariu pentru servitor ce este afișat pe + ecran și cu comanda NET VIEW. Introduceți textul între + ghilimele. +/HIDDEN:{YES | NO} Specifică dacă numele calculatorului servitorului apare + în listările de servitoare de pe ecran. Rețineți că + listările de servitoare de pe ecran nu modifică permisiunile din acel + servitor. Valoarea implicită este NO (NU). + +Pentru a afișa configurația actuală pentru serviciul servitorului, tastați +NET CONFIG SERVER fără parametri. NET HELP comandă | MORE (pentru afișare paginată). . @@ -940,10 +945,10 @@ usługa Wstrzymana usługa NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET CONTINUE reactivates a service that has been suspended by NET PAUSE. +Comanda NET CONTINUE reactivează un serviciu ce a fost suspendat de NET PAUSE. -service Is the paused service - For example, one of the following: +serviciu Este serviciul pauzat + De exemplu, unul dintre următoarele: NET LOGON NT LM SECURITY SUPPORT PROVIDER SCHEDULE @@ -1029,7 +1034,7 @@ Language=Polish NET FILE [identyfikator [/CLOSE]] . Language=Romanian -NET FILE [id [/CLOSE]] +NET FILE [identificator (id) [/CLOSE]] . Language=Russian NET FILE [id [/CLOSE]] @@ -1101,9 +1106,9 @@ NET GROUP [nazwa_grupy [/COMMENT:"tekst"]] [/DOMAIN] nazwa_grupy nazwa_użytkownika [...] {/ADD | /DELETE} [/DOMAIN] . Language=Romanian -NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] - groupname {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] - groupname username [...] {/ADD | /DELETE} [/DOMAIN] +NET GROUP [numele grupului [/COMMENT:"text"]] [/DOMAIN] + numele grupului {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + numele grupului numele utilizatorului [...] {/ADD | /DELETE} [/DOMAIN] . Language=Russian NET GROUP [groupname [/COMMENT:"text"]] [/DOMAIN] @@ -1176,21 +1181,26 @@ nazwa_użytkownika[ ...] Lista zawierająca nazwy jednego lub kilku NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET GROUP adds, displays or modifies global groups on servers. When -used without parameters, it displays the groupnames on the server. - -groupname Is the name of the group to add, expand, or delete. - Supply only a groupname to view a list of users - in a group. -/COMMENT:"text" Adds a comment for a new or existing group. - Enclose the text in quotation marks. -/DOMAIN Performs the operation on a domain controller - of the current domain. Otherwise, the operation is - performed on the local computer. -username[ ...] List one or more usernames to add to or remove from - a group. Separate multiple username entries with a space. -/ADD Adds a group, or adds a username to a group. -/DELETE Removes a group, or removes a username from a group. +Comanda NET GROUP adaugă, afișează sau modifică grupurile globale ale +servitoarelor. Când e folosită fără parametrii, se afișează numele de grup pe +servitoare. + +numele grupului Este numele grupului de adăugat, de extins sau de șters. + Furnizează doar un nume de grup pentru a vedea o listă de + utilizatori dintr-un grup. +/COMMENT:"text" Adaugă un comentariu pentru un grup nou sau existent. + Introduce textul între ghilimele. +/DOMAIN Efectuați operațiunea pe un controlor de domeniu + al domeniului curent. Altfel, operațiunea este + efectuată la un calculator local. + +numele utilizatorului[ ...] + Listează unul sau mai multe nume de utilizator pentru a le + adăuga sau a le șterge dintr-un grup. Separați mai multe + intrări ale numelor de utilizator cu spațiu. +/ADD Adaugă un grup sau adaugă un nume de utilizator la un grup. +/DELETE Șterge un grup sau șterge un nume de utilizator dintr-un + grup. NET HELP comandă | MORE (pentru afișare paginată). . @@ -1474,7 +1484,7 @@ Language=Polish NET HELPMSG komunikat# . Language=Romanian -NET HELPMSG <Error Code> +NET HELPMSG <Cod de eroare> . Language=Russian NET HELPMSG <Код ошибки> @@ -1514,12 +1524,13 @@ objaśni komunikat i zasugeruje rozwiązanie problemu. komunikat# Numeryczny błąd systemu, o którym chcesz uzyskać informacje. . Language=Romanian -NET HELPMSG displays information about network messages (such as -error, warning and alert messages). When you type NET HELPMSG and the numeric -error (for example, "net helpmsg 2182"), you will get information about the -message and suggested actions you can take to solve the problem. +Comanda NET HELPMSG afișează informații despre mesajele de rețea (precum, +mesaje de eroare, de atenționare și de alertă). Când tastați NET HELPMSG și +eroarea numerică (de exemplu, "net helpmsg 2182"), veți obține informații +despre mesaj și despre acțiunile sugerate pe care le luați ca să rezolvați +problema. -message# Is the numerical error with which you need help. +mesaj# Este eroarea numerică cu care aveți nevoie de ajutor. . Language=Russian NET HELPMSG displays information about network messages (such as @@ -1578,9 +1589,9 @@ NET LOCALGROUP [nazwa_grupy [/COMMENT:"tekst"]] [/DOMAIN] nazwa_grupy nazwa [...] {/ADD | /DELETE} [/DOMAIN] . Language=Romanian -NET LOCALGROUP [nume-de-grup [/COMMENT:"text"]] [/DOMAIN] - nume-de-grup {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] - nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN] +NET LOCALGROUP [nume de grup [/COMMENT:"text"]] [/DOMAIN] + nume de grup {/ADD [/COMMENT:"text"] | /DELETE} [/DOMAIN] + nume de grup nume [...] {/ADD | /DELETE} [/DOMAIN] . Language=Russian NET LOCALGROUP [имя_группы [/COMMENT:"текст"]] [/DOMAIN] @@ -1666,27 +1677,30 @@ nazwa[ ...] Lista zawierająca nazwy jednego lub kilku użytkowników NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET LOCALGROUP adds, displays or modifies local groups on computers. When -used without parameters, it displays the local groups on the computer. - -groupname Is the name of the local group to add, expand, or - delete. Supply only a groupname to view a list of - users or global groups in a local group. -/COMMENT:"text" Adds a comment for a new or existing group. - Enclose the text in quotation marks. -/DOMAIN Performs the operation on a domain controller - of the current domain. Otherwise, the operation is - performed on the local computer. -name[ ...] List one or more usernames or groupnams to add to or - remove from a local group. Separate multiple entries with - a space. Names may be users or global groups, but not - other local groups. If a user is from another doamin, - preface the username with the domain name (for - example, SALES\RALPHR). -/ADD Adds a groupname or username to a local group. An account - must be established for users or global groups added to a - local group with this command. -/DELETE Removes a groupname or username from a local group. +Comanda NET LOCALGROUP adaugă, afișează sau modifică grupurile locale din +calculatoare. Când este folosit fără parametri, se afișează grupurile locale +din calculator. + +numele grupului Este numele grupului local ce urmează să fie adăugat, extins + sau șters. Furnizează numai numele grupului pentru a vizualiza + o listă a utilizatorilor sau a grupurilor globale într-un grup + local. +/COMMENT:"text" Adaugă un comentariu pentru un grup nou sau pentru unul existent. + Introduceți textul între ghilimele. +/DOMAIN Efectuează operațiunea pe un controlor al domeniului curent. + Altfel, operațiunea este efectuată la + calculatorul local. +nume[ ...] Listează unul sau mai multe nume de utilizatori sau nume de + grup pentru a le adăuga sau a le șterge din grupul local. + Separă mai multe intrări cu un spațiu. Numele pot fi utilizatori sau + grupuri globale, dar nu alte grupuri locale. Dacă un utilizator este + dintr-un alt domeniu, adăugați numele domeniului în fața numelui + utilizatorului (de exemplu, VÂNZĂRI\ANDREI). +/ADD Adaugă un nume de grup sau un nume de utilizator la grupul + local. Un cont trebuie să fie stabilit pentru utilizatori sau + pentru grupurile globale adăugate la un grup local cu această comandă. +/DELETE Șterge un nume de grup sau un nume de utilizator dintr-un grup + local. NET HELP comandă | MORE (pentru afișare paginată). . @@ -1866,9 +1880,9 @@ usługa Nazwa wstrzymywanej usługi. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET PAUSE suspends a service. Pausing a service puts it on hold. +NET PAUSE suspendă un serviciu. Pauzarea unui serviciu îl pune în așteptare. -service The name of the service to be paused. +serviciu Numele serviciului de pauzat. NET HELP comandă | MORE (pentru afișare paginată). . @@ -2001,14 +2015,14 @@ NET SHARE nazwa_udziału=dysk:ścieżka [/GRANT:użytkownik,[READ | CHANGE | FUL {nazwa_udziału | nazwa_urządzenia | dysk:ścieżka} /DELETE . Language=Romanian -NET SHARE sharename=drive:path [/GRANT:user,[READ | CHANGE | FULL]] - [/USERS:number | /UNLIMITED] +NET SHARE sharename=disc:cale [/GRANT:utilizator,[READ | CHANGE | FULL]] + [/USERS:număr | /UNLIMITED] [/REMARK:"text"] [/CACHE:Manual | Documents| Programs | None] - sharename [/USERS:number | /UNLIMITED] + sharename [/USERS:număr | /UNLIMITED] [/REMARK:"text"] [/CACHE:Manual | Documents | Programs | None] - {sharename | devicename | drive:path} /DELETE + {numele de partajare | numele dispozitivului | disc:cale} /DELETE . Language=Russian NET SHARE sharename=drive:path [/GRANT:user,[READ | CHANGE | FULL]] @@ -2145,35 +2159,40 @@ nazwa_urządzenia NET HELP command | MORE displays Help one screen at a time. . Language=Romanian -NET SHARE makes a server's resources available to network users. When -used without options, it lists information about all resources being -shared on the computer. For each resource, Windows reports the -devicename(s) or pathname(s) and a descriptive comment associated with it. - -sharename Is the network name of the shared resource. Type - NET SHARE with a sharename only to display information - about that share. -drive:path Specifies the absolute path of the directory to - be shared. -/GRANT:user,perm Creates the share with a security descriptor that gives - the requested permissions to the specified user. This - option may be used more than once to give share permissions - to multiple users. -/USERS:number Sets the maximum number of users who can - simultaneously access the shared resource. -/UNLIMITED Specifies an unlimited number of users can - simultaneously access the shared resource. -/REMARK:"text" Adds a descriptive comment about the resource. - Enclose the text in quotation marks. -devicename Is one or more printers (LPT1: through LPT9:) - shared by sharename. -/DELETE Stops sharing the resource. -/CACHE:Manual Enables manual client caching of programs and documents - from this share. -/CACHE:Documents Enables automatic caching of documents from this share. -/CACHE:Programs Enables automatic caching of documents and programs - from this share. -/CACHE:None Disables caching from this share. +Comanda NET SHARE face resursele servitorului valabile utilizatorilor rețelei. +Când e folosită fără opțiuni, se listează informațiile despre toate resursele +ce sunt partajate la calculator. Pentru fiecare resursă Windows raportează +numele dispozitivului(elor) sau numele căii(ilor) și un comentariu descriptiv +asociat cu el. + +numele de partajare + Este numele rețelei resurselor partajate. Tastați comanda + NET SHARE cu un nume de partajare numai ca să afișați + informații despre acea partajare. +disc:cale Precizează calea absolută a directorului ce urmează + să fie partajat. +/GRANT:utilizator, permisiune + Crează partajarea cu un descriptor de securitate ce oferă + permisiunile cerute utilizatorului specificat. Această + opțiune poate fi folosită mai mult decât o dată pentru a da permisiuni + de partajare mai multor utilizatori. +/USERS:număr Setează numărul maxim al utilizatorilor ce pot accesa + simultan resursele partajate. +/UNLIMITED Specifică un număr nelimitat de utilizatori ce pot accesa + simultan resursele partajate. +/REMARK:"text" Adaugă un comentariu descriptiv despre resursă. + Introduceți textul între ghilimele. +numele dispozitivului + Reprezintă una sau mai multe imprimante (de la LPT1: până la + LPT9:) partajate de un nume de partajare. +/DELETE Oprește partajarea de resurse. +/CACHE:Manual Activează depozitarea manuală a programelor și documentelor + clientului din această partajare. +/CACHE:Documents Activează depozitarea automată a documentelor din această + partajare. +/CACHE:Programs Activează depozitarea automată a documentelor și programelor + din această partajare. +/CACHE:None Dezactivează depozitarea din această partajare. NET HELP command | MORE displays Help one screen at a time. . @@ -2355,7 +2374,7 @@ Language=Polish NET START [usługa] . Language=Romanian -NET START [service] +NET START [serviciu] . Language=Russian NET START [service] @@ -2401,13 +2420,13 @@ NET START "NET LOGON" uruchamia usługę logowania w sieci. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET START starts services or lists running services. +Comanda NET START pornește serviciile sau listează serviciile pornite. -service The name of the service to be started. +serviciu Numele serviciului ce urmează să fie pornit. -When typed at the command prompt, service name of two words or more must -be enclosed in quotation marks. For example, NET START "NET LOGON" -starts the net logon service. +Când este tastat la linia de comandă, numele serviciului de două sau mai multe +cuvinte trebuie să fie să fie introdus între ghilimele. De exemplu, comanda +NET START "NET LOGON" pornește serviciul de autentificare. NET HELP comandă | MORE (pentru afișare paginată). . @@ -2523,12 +2542,12 @@ WORKSTATION Wyświetla statystykę usługi Stacja robocza. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET STATISTICS displays the statisticslog for the local Workstation or -Server service. Used without parameters, NET STATISTICS displays -the services for which statistics are available. +Comanda NET STATISTICS afișează jurnalul de statistici pentru serviciul stației +de lucru locale sau pentru servitor. Folosită fără parametri, comanda NET +STATISTICS afișează serviciile pentru care sunt disponibile statistici. -SERVER Displays the Server service statistics. -WORKSTATION Displays the Workstation service statistics. +SERVER Afișează statisticile serviciului servitorului. +WORKSTATION Afișează statisticile serviciului stației de lucru. NET HELP comandă | MORE (pentru afișare paginată). . @@ -2641,13 +2660,13 @@ może też zatrzymać inne. Niektóre usługi nie mogą być zatrzymane. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. . Language=Romanian -NET STOP stops services. +Comanda NET STOP oprește serviciile. -service The name of the service to be stopped. +serviciu Numele serviciului ce urmează să fie oprit. -Stopping a service cancels any network connection the service is -using. Also, some services are dependent on others. Stopping one -service can stop others. Some services cannot be stopped. +Oprind un serviciu se anulează orice conexiune de rețea pe care îl folosește +serviciul. De asemenea, câteva servicii sunt dependente de altele. Oprind un +serviciu se pot opri și celelalte. Câteva servicii nu pot fi oprite. NET HELP comandă | MORE (pentru afișare paginată). . @@ -3069,78 +3088,82 @@ Opcje Polecenie posiada następujące opcje: NET HELP command | MORE displays Help one screen at a time. . Language=Romanian -NET USER creates and modifies user accounts on computers. When used -without switches, it lists the user accounts for the computer. The -user account information is stored in the user accounts database. - -username Is the name of the user account to add, delete, modify, or - view. The name of the user account can have as many as - 20 characters. -password Assigns or changes a password for the user's account. - A password must satisfy the minimum length set with the - /MINPWLEN option of the NET ACCOUNTS command. It can have as - many as 14 characters. -* Produces a prompt for the password. The password is not - displayed when you type it at a password prompt. -/DOMAIN Performs the operation on a domain controller of - the current domain. -/ADD Adds a user account to the user accounts database. -/DELETE Removes a user account from the user accounts database. - -Options Are as follows: - - Options Description +Comanda NET USER crează și modifică conturile de utilizator din calculatoare. +Când este folosit fără comutatoare, se listează conturile de utilizator pentru +calculator. Informațiile contului utilizatorului sunt stocate în baza de date a +conturilor utilizatorului. + +cont de utilizator + Este numele contului de utilizator de adăugat, de șters, de + modificat sau de văzut. Numele contului utilizatorului poate avea + până la 20 de caractere. +parolă Atribuie sau schimbă o parolă pentru contul utilizatorului. + O parolă trebuie să satisfacă lungimea minimă stabilită cu + opțiunea /MINPWLEN a comenzii NET ACCOUNTS. Poate avea până la 14 + caractere. +* Produce o solicitare pentru parolă. Parola nu este afișată atunci + când o scrieți în formularul de solicitare a parolei. +/DOMAIN Efectuează operațiunea pe un controlor de domeniu a controlorului + actual. +/ADD Adaugă un cont de utilizator în baza de date a conturilor de + utilizatori. +/DELETE Șterge un cont de utilizator în baza de date a conturilor de + utilizatori. + +Opțiuni Sunt după cum urmează: + + Opțiuni Descriere -------------------------------------------------------------------- - /ACTIVE:{YES | NO} Activates or deactivates the account. If - the account is not active, the user cannot - access the server. The default is YES. - /COMMENT:"text" Provides a descriptive comment about the - user's account. Enclose the text in - quotation marks. - /COUNTRYCODE:nnn Uses the operating system country code to - implement the specified language files for a - user's help and error messages. A value of - 0 signifies the default country code. - /EXPIRES:{date | NEVER} Causes the account to expire if date is - set. NEVER sets no time limit on the - account. An expiration date is in the - form mm/dd/yy(yy). Months can be a number, - spelled out, or abbreviated with three - letters. Year can be two or four numbers. - Use slashes(/) (no spaces) to separate - parts of the date. - /FULLNAME:"name" Is a user's full name (rather than a - username). Enclose the name in quotation - marks. - /HOMEDIR:pathname Sets the path for the user's home directory. - The path must exist. - /PASSWORDCHG:{YES | NO} Specifies whether users can change their - own password. The default is YES. - /PASSWORDREQ:{YES | NO} Specifies whether a user account must have - a password. The default is YES. - /PROFILEPATH[:path] Sets a path for the user's logon profile. - /SCRIPTPATH:pathname Is the location of the user's logon - script. - /TIMES:{times | ALL} Is the logon hours. TIMES is expressed as - day[-day][,day[-day]],time[-time][,time - [-time]], limited to 1-hour increments. - Days can be spelled out or abbreviated. - Hours can be 12- or 24-hour notation. For - 12-hour notation, use am, pm, a.m., or - p.m. ALL means a user can always log on, - and a blank value means a user can never - log on. Separate day and time entries with - a comma, and separate multiple day and time - entries with a semicolon. - /USERCOMMENT:"text" Lets an administrator add or change the User - Comment for the account. - /WORKSTATIONS:{computername[,...] | *} - Lists as many as eight computers from - which a user can log on to the network. If - /WORKSTATIONS has no list or if the list is *, - the user can log on from any computer. - -NET HELP command | MORE displays Help one screen at a time. + /ACTIVE:{YES | NO} Activează sau dezactivează contul. Dacă contul nu + e activ, utilizatorul nu poate accesa servitorul. + Implicit este DA (YES). + /COMMENT:"text" Furnizează un comentariu descriptiv despre contul + utilizatorului. Introduceți textul între + ghilimele. + /COUNTRYCODE:nnn Folosește codul de țară al sistemului de operare + pentru a implementa fișierele de limbă + specificate pentru ajutorul utilizatorului și pentru mesajele de + eroare. Valoarea 0 înseamnă codul de țară implicit. + /EXPIRES:{dată | NEVER} Determină expirarea contului dacă data este + setată. Niciodată (NEVER) nu setează nicio limită + de timp pentru cont. O dată de expirare este de forma lună/zi/an + (întreg). Lunile pot fi un număr precizat sau abreviat cu trei litere. + Anul poate fi format din două sau patru cifre. + Folosiți bare oblice (/) (fără spații) pentru a separa părțile datei. + /FULLNAME:"nume" Este numele întreg al utilizatorului (mai degrabă + decât un nume de utilizator). Introduceți numele + între ghilimele. + /HOMEDIR:numele căii Setează calea directorului de acasă al + utilizatorului. Calea trebuie să existe. + /PASSWORDCHG:{YES | NO} Specifică dacă utilizatorii își pot schimba + parola. Implicit este DA (YES). + /PASSWORDREQ:{YES | NO} Specifică dacă un cont de utilizator trebuie + să aibă o parolă. Implicit este DA (YES). + /PROFILEPATH[:cale] Setează o cale pentru profilul de autentificare + a utilizatorului. + /SCRIPTPATH:numele căii E locația scriptului de autentificare + a utilizatorului. + /TIMES:{ori | ALL} Reprezintă orele de autentificare. Valoarea + TIMES (ORI) este exprimată ca zi[-day][, + zi[-day]],timp[-time][,timp[-time]], limitate la + incrementări de o oră. Zilele pot fi scrise sau + prescurtate. Orele pot fi în notație de 12 sau de + 24 de ore. Pentru notația de 12 ore, folosiți am, + pm, a.m. sau p.m. ALL (TOATE) înseamnă că un + utilizator se poate autentifica oricând iar o valoare goală înseamnă + că un utilizator nu se poate autentifica niciodată. Separați intrările + de zi și de timp cu o virgulă și separați + intrările de mai multe zile și de timp cu punct și virgulă. + /USERCOMMENT:"text" Lasă un administrator să adauge sau să schimbe + Comentariul utilizatorului pentru cont. + + /WORKSTATIONS:{numele calculatorului[,...] | *} + Listează până la opt calculatoare din care + un utilizator se poate conecta la rețea. Dacă comanda /WORKSTATIONS + nu are nicio listă sau dacă lista este *, utilizatorul se poate + autentifica din orice calculator. + +NET HELP comandă | MORE afișează Help pentru afișare paginată. . Language=Russian NET USER creates and modifies user accounts on computers. When used @@ -3697,33 +3720,34 @@ Do opisu składni poleceń użyto następujących zasad: . Language=Romanian SYNTAX -The following conventions are used to indicate command syntax: +Convențiile următoare sunt folosite pentru a indica sintaxa comenzilor: -- Capital letters represent words that must be typed as shown. Lower- - case letters represent names of items that may vary, such as filenames. +- Majusculele reprezintă cuvinte ce trebuie tastate așa cum sunt arătate. + Literele mici reprezintă numele articolelor ce pot varia, precum numele de + fișiere. -- The [ and ] characters surround optional items that can be supplied - with the command. +- Caracterele [ și ] înconjoară elementele opționale care pot fi furnizate + împreună cu comanda. -- The { and } characters surround lists of items. You must supply one - of the items with the command. +- Caracterele { și } înconjoară liste de articole. Trebuie să furnizați + una dintre articole cu comanda. -- The | character separates items in a list. Only one of the items can - be supplied with the command. +- Caracterul | separă articolele într-o listă. Numai unul dintre articole + poate fi furnizat de comandă. - For example, in the following syntax, you must type NET COMMAND and - either SWITCH1 or SWITCH2. Supplying a name is optional. - NET COMMAND [name] {SWITCH1 | SWITCH2} + De exemplu, în sintaxa următoare, trebuie să tastați NET COMMAND și + fie SWITCH1, fie SWITCH2. Furnizând un nume este opțional. + NET COMMAND [nume] {SWITCH1 | SWITCH2} -- The [...] characters mean you can repeat the previous item. - Separate items with spaces. +- Caracterele [...] înseamnă că puteți repeta articolul anterior. + Separați articolele cu spații. -- The [,...] characters mean you can repeat the previous item, but - you must separate items with commas or semicolons, not spaces. +- Caracterele [,...] înseamnă că puteți repeta articolul anterior, dar trebuie + să separați articolele cu virgule sau cu puncte și virgule, nu cu spații. -- When typed at the command prompt, service names of two words or - more must be enclosed in quotation marks. For example, - NET START "COMPUTER BROWSER" starts the computer browser service. +- Când sunt tastate în panoul de comandă, numele de servicii a două sau mai + multe cuvinte trebuie cuprinse între ghilimele. De exemplu, + NET START "COMPUTER BROWSER" începe cu serviciul navigatorului calculatorului. . Language=Russian SYNTAX

1 year, 1 month

[reactos] 01/01: [SHELL32] Rename file on copy-paste path collision (#5462)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=520577a8ecccc6f2954d0… commit 520577a8ecccc6f2954d00b662640011f2800fa7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 6 20:56:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 20:56:45 2023 +0900 [SHELL32] Rename file on copy-paste path collision (#5462) - If the source and destination of copying file are on the same directory, then enable FOF_RENAMEONCOLLISION flag. End if. - Don't show error message IDS_COPYERRORSUBFOLDER or IDS_MOVEERRORSUBFOLDER if the source and the destination are the same. CORE-18599 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 17 ++++++++++++++++- dll/win32/shell32/shlfileop.cpp | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 10aee5e3532..f480ffa9808 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -42,6 +42,7 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, PWCHAR pwszListPos = pwszSrcPathsList; STRRET strretFrom; SHFILEOPSTRUCTW fop; + BOOL bRenameOnCollision = FALSE; /* Build a double null terminated list of C strings from source paths */ for (UINT i = 0; i < cidl; i++) @@ -64,7 +65,18 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, if (FAILED(ret)) goto cleanup; - wszDstPath[lstrlenW(wszDstPath) + 1] = L'\0'; + wszDstPath[lstrlenW(wszDstPath) + 1] = UNICODE_NULL; + + /* Set bRenameOnCollision to TRUE if necesssary */ + if (bCopy) + { + WCHAR szPath1[MAX_PATH], szPath2[MAX_PATH]; + GetFullPathNameW(pwszSrcPathsList, _countof(szPath1), szPath1, NULL); + GetFullPathNameW(wszDstPath, _countof(szPath2), szPath2, NULL); + PathRemoveFileSpecW(szPath1); + if (_wcsicmp(szPath1, szPath2) == 0) + bRenameOnCollision = TRUE; + } ZeroMemory(&fop, sizeof(fop)); fop.hwnd = m_hwndSite; @@ -72,6 +84,9 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, fop.pFrom = pwszSrcPathsList; fop.pTo = wszDstPath; fop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + if (bRenameOnCollision) + fop.fFlags |= FOF_RENAMEONCOLLISION; + ret = S_OK; if (SHFileOperationW(&fop)) diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 351ee1e4c5c..18956867143 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1940,7 +1940,7 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { size_t cchFrom = PathAddBackslashW(szFrom) - szFrom; size_t cchTo = PathAddBackslashW(szTo) - szTo; - if (cchFrom <= cchTo) + if (cchFrom < cchTo) { WCHAR ch = szTo[cchFrom]; szTo[cchFrom] = 0;

1 year, 1 month

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnRegKey (#5531)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4684e9809ba42fa5f5c6… commit b4684e9809ba42fa5f5c644f02aa75893f232324 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 6 20:54:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 6 20:54:55 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] SHCreatePropertyBagOnRegKey (#5531) Follow-up to #5511. - Add CRegPropertyBag class. - Implement SHCreatePropertyBagOnRegKey function by using CRegPropertyBag. - Strengthen SHPropertyBag testcase in shlwapi_apitest. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 2 + dll/win32/shlwapi/precomp.h | 1 - dll/win32/shlwapi/propbag.cpp | 333 ++++++++++++++++++++- dll/win32/shlwapi/shlwapi.spec | 2 +- .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 187 +++++++++++- sdk/include/reactos/shlwapi_undoc.h | 9 + 6 files changed, 528 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 9053c33b956..f43408d9479 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5068,6 +5068,7 @@ free_sids: return psd; } +#ifndef __REACTOS__ /* See propbag.cpp */ /*********************************************************************** * SHCreatePropertyBagOnRegKey [SHLWAPI.471] * @@ -5093,6 +5094,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, return E_NOTIMPL; } +#endif /*********************************************************************** * SHGetViewStatePropertyBag [SHLWAPI.515] diff --git a/dll/win32/shlwapi/precomp.h b/dll/win32/shlwapi/precomp.h index 86f3ea401fd..2113a5dd967 100644 --- a/dll/win32/shlwapi/precomp.h +++ b/dll/win32/shlwapi/precomp.h @@ -20,7 +20,6 @@ #include <wingdi.h> #include <wincon.h> #include <winternl.h> -#define NO_SHLWAPI_STREAM #define NO_SHLWAPI_USER #include <shlwapi.h> #include <shlobj.h> diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 27434091fc3..f9951324d0c 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -51,6 +51,8 @@ public: *ppvObject = static_cast<IPropertyBag*>(this); return S_OK; } + + ERR("%p: %s: E_NOTIMPL\n", this, debugstr_guid(&riid)); return E_NOTIMPL; } STDMETHODIMP_(ULONG) AddRef() override @@ -245,9 +247,336 @@ SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **pp CComPtr<CMemPropertyBag> pMemBag(new CMemPropertyBag(dwMode)); - HRESULT hr = pMemBag->QueryInterface(riid, ppvObj); + return pMemBag->QueryInterface(riid, ppvObj); +} + +class CRegPropertyBag : public CBasePropertyBag +{ +protected: + HKEY m_hKey; + + HRESULT _ReadDword(LPCWSTR pszPropName, VARIANT *pvari); + HRESULT _ReadString(LPCWSTR pszPropName, VARIANTARG *pvarg, UINT len); + HRESULT _ReadBinary(LPCWSTR pszPropName, VARIANT *pvari, VARTYPE vt, DWORD uBytes); + HRESULT _ReadStream(VARIANT *pvari, BYTE *pInit, UINT cbInit); + HRESULT _CopyStreamIntoBuff(IStream *pStream, void *pv, ULONG cb); + HRESULT _GetStreamSize(IStream *pStream, LPDWORD pcbSize); + HRESULT _WriteStream(LPCWSTR pszPropName, IStream *pStream); + +public: + CRegPropertyBag(DWORD dwMode) + : CBasePropertyBag(dwMode) + , m_hKey(NULL) + { + } + + ~CRegPropertyBag() override + { + if (m_hKey) + ::RegCloseKey(m_hKey); + } + + HRESULT Init(HKEY hKey, LPCWSTR lpSubKey); + + STDMETHODIMP Read(_In_z_ LPCWSTR pszPropName, _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override; +}; + +HRESULT CRegPropertyBag::Init(HKEY hKey, LPCWSTR lpSubKey) +{ + REGSAM nAccess = 0; + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_WRITE) + nAccess |= KEY_READ; + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) != STGM_READ) + nAccess |= KEY_WRITE; + + LONG error; + if (m_dwMode & STGM_CREATE) + error = ::RegCreateKeyExW(hKey, lpSubKey, 0, NULL, 0, nAccess, NULL, &m_hKey, NULL); + else + error = ::RegOpenKeyExW(hKey, lpSubKey, 0, nAccess, &m_hKey); + + if (error != ERROR_SUCCESS) + { + ERR("%p %s 0x%08X\n", hKey, debugstr_w(lpSubKey), error); + return HRESULT_FROM_WIN32(error); + } + + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadDword(LPCWSTR pszPropName, VARIANT *pvari) +{ + DWORD cbData = sizeof(DWORD); + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, NULL, &V_UI4(pvari), &cbData); + if (error) + return E_FAIL; + + V_VT(pvari) = VT_UI4; + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadString(LPCWSTR pszPropName, VARIANTARG *pvarg, UINT len) +{ + BSTR bstr = ::SysAllocStringByteLen(NULL, len); + V_BSTR(pvarg) = bstr; + if (!bstr) + return E_OUTOFMEMORY; + + V_VT(pvarg) = VT_BSTR; + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, NULL, bstr, (LPDWORD)&len); + if (error) + { + ::VariantClear(pvarg); + return E_FAIL; + } + + return S_OK; +} + +HRESULT CRegPropertyBag::_ReadStream(VARIANT *pvari, BYTE *pInit, UINT cbInit) +{ + IStream *pStream = SHCreateMemStream(pInit, cbInit); + V_UNKNOWN(pvari) = pStream; + if (!pStream) + return E_OUTOFMEMORY; + V_VT(pvari) = VT_UNKNOWN; + return S_OK; +} + +HRESULT +CRegPropertyBag::_ReadBinary( + LPCWSTR pszPropName, + VARIANT *pvari, + VARTYPE vt, + DWORD uBytes) +{ + HRESULT hr = E_FAIL; + if (vt != VT_UNKNOWN || uBytes < sizeof(GUID)) + return hr; + + LPBYTE pbData = (LPBYTE)::LocalAlloc(LMEM_ZEROINIT, uBytes); + if (!pbData) + return hr; + + if (!SHGetValueW(m_hKey, NULL, pszPropName, NULL, pbData, &uBytes) && + memcmp(&GUID_NULL, pbData, sizeof(GUID)) == 0) + { + hr = _ReadStream(pvari, pbData + sizeof(GUID), uBytes - sizeof(GUID)); + } + + ::LocalFree(pbData); + + return hr; +} + +HRESULT CRegPropertyBag::_CopyStreamIntoBuff(IStream *pStream, void *pv, ULONG cb) +{ + LARGE_INTEGER li; + li.QuadPart = 0; + HRESULT hr = pStream->Seek(li, 0, NULL); + if (FAILED(hr)) + return hr; + return pStream->Read(pv, cb, NULL); +} + +HRESULT CRegPropertyBag::_GetStreamSize(IStream *pStream, LPDWORD pcbSize) +{ + *pcbSize = 0; + + ULARGE_INTEGER ui; + HRESULT hr = IStream_Size(pStream, &ui); + if (FAILED(hr)) + return hr; + + if (ui.DUMMYSTRUCTNAME.HighPart) + return E_FAIL; /* 64-bit value is not supported */ + + *pcbSize = ui.DUMMYSTRUCTNAME.LowPart; + return hr; +} + +STDMETHODIMP +CRegPropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + UNREFERENCED_PARAMETER(pErrorLog); + + TRACE("%p: %s %p %p\n", this, debugstr_w(pszPropName), pvari, pErrorLog); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_WRITE) + { + ERR("%p: 0x%X\n", this, m_dwMode); + ::VariantInit(pvari); + return E_ACCESSDENIED; + } + + VARTYPE vt = V_VT(pvari); + VariantInit(pvari); + + HRESULT hr; + DWORD dwType, cbValue; + LONG error = SHGetValueW(m_hKey, NULL, pszPropName, &dwType, NULL, &cbValue); + if (error != ERROR_SUCCESS) + hr = E_FAIL; + else if (dwType == REG_SZ) + hr = _ReadString(pszPropName, pvari, cbValue); + else if (dwType == REG_BINARY) + hr = _ReadBinary(pszPropName, pvari, vt, cbValue); + else if (dwType == REG_DWORD) + hr = _ReadDword(pszPropName, pvari); + else + hr = E_FAIL; + + if (FAILED(hr)) + { + ERR("%p: 0x%08X %ld: %s %p\n", this, hr, dwType, debugstr_w(pszPropName), pvari); + ::VariantInit(pvari); + return hr; + } + + hr = ::VariantChangeTypeForRead(pvari, vt); if (FAILED(hr)) - ERR("0x%08X %s\n", hr, debugstr_guid(&riid)); + { + ERR("%p: 0x%08X %ld: %s %p\n", this, hr, dwType, debugstr_w(pszPropName), pvari); + ::VariantInit(pvari); + } + + return hr; +} + +HRESULT +CRegPropertyBag::_WriteStream(LPCWSTR pszPropName, IStream *pStream) +{ + DWORD cbData; + HRESULT hr = _GetStreamSize(pStream, &cbData); + if (FAILED(hr) || !cbData) + return hr; + + DWORD cbBinary = cbData + sizeof(GUID); + LPBYTE pbBinary = (LPBYTE)::LocalAlloc(LMEM_ZEROINIT, cbBinary); + if (!pbBinary) + return E_OUTOFMEMORY; + + hr = _CopyStreamIntoBuff(pStream, pbBinary + sizeof(GUID), cbData); + if (SUCCEEDED(hr)) + { + if (SHSetValueW(m_hKey, NULL, pszPropName, REG_BINARY, pbBinary, cbBinary)) + hr = E_FAIL; + } + + ::LocalFree(pbBinary); + return hr; +} + +STDMETHODIMP +CRegPropertyBag::Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) +{ + TRACE("%p: %s %p\n", this, debugstr_w(pszPropName), pvari); + + if ((m_dwMode & (STGM_READ | STGM_WRITE | STGM_READWRITE)) == STGM_READ) + { + ERR("%p: 0x%X\n", this, m_dwMode); + return E_ACCESSDENIED; + } + + HRESULT hr; + LONG error; + VARIANTARG vargTemp = { 0 }; + switch (V_VT(pvari)) + { + case VT_EMPTY: + SHDeleteValueW(m_hKey, NULL, pszPropName); + hr = S_OK; + break; + + case VT_BOOL: + case VT_I1: + case VT_I2: + case VT_I4: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_INT: + case VT_UINT: + { + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_UI4); + if (FAILED(hr)) + return hr; + + error = SHSetValueW(m_hKey, NULL, pszPropName, REG_DWORD, &V_UI4(&vargTemp), sizeof(DWORD)); + if (error) + hr = E_FAIL; + + ::VariantClear(&vargTemp); + break; + } + + case VT_UNKNOWN: + { + CComPtr<IStream> pStream; + hr = V_UNKNOWN(pvari)->QueryInterface(IID_IStream, (void **)&pStream); + if (FAILED(hr)) + return hr; + + hr = _WriteStream(pszPropName, pStream); + break; + } + + default: + { + hr = ::VariantChangeType(&vargTemp, pvari, 0, VT_BSTR); + if (FAILED(hr)) + return hr; + + int cch = lstrlenW(V_BSTR(&vargTemp)); + DWORD cb = (cch + 1) * sizeof(WCHAR); + error = SHSetValueW(m_hKey, NULL, pszPropName, REG_SZ, V_BSTR(&vargTemp), cb); + if (error) + hr = E_FAIL; + + ::VariantClear(&vargTemp); + break; + } + } return hr; } + +/************************************************************************** + * SHCreatePropertyBagOnRegKey (SHLWAPI.471) + * + * Creates a property bag object on registry key. + * + * @param hKey The registry key. + * @param pszSubKey The path of the sub-key. + * @param dwMode The combination of STGM_READ, STGM_WRITE, STGM_READWRITE, and STGM_CREATE. + * @param riid Specifies either IID_IUnknown, IID_IPropertyBag or IID_IPropertyBag2. + * @param ppvObj Receives an IPropertyBag pointer. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://source.winehq.org/WineAPI/SHCreatePropertyBagOnRegKey.html + */ +EXTERN_C HRESULT WINAPI +SHCreatePropertyBagOnRegKey( + _In_ HKEY hKey, + _In_z_ LPCWSTR pszSubKey, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj) +{ + TRACE("%p, %s, 0x%08X, %s, %p\n", hKey, debugstr_w(pszSubKey), dwMode, + debugstr_guid(&riid), ppvObj); + + *ppvObj = NULL; + + CComPtr<CRegPropertyBag> pRegBag(new CRegPropertyBag(dwMode)); + + HRESULT hr = pRegBag->Init(hKey, pszSubKey); + if (FAILED(hr)) + return hr; + + return pRegBag->QueryInterface(riid, ppvObj); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 0844af03d5d..13cac9b8c7a 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -468,7 +468,7 @@ 468 stub -noname RunIndirectRegCommand 469 stub -noname RunRegCommand 470 stub -noname IUnknown_ProfferServiceOld -471 stdcall -noname SHCreatePropertyBagOnRegKey(long wstr long ptr ptr) +471 stdcall -noname SHCreatePropertyBagOnRegKey(ptr wstr long ptr ptr) 472 stub -noname SHCreatePropertyBagOnProfileSelection 473 stub -noname SHGetIniStringUTF7W 474 stub -noname SHSetIniStringUTF7W diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 2114ceff231..365c4478f19 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -96,7 +96,7 @@ public: if (lstrcmpiW(pszPropName, L"GUID1") == 0) { V_VT(pvari) = (VT_UI1 | VT_ARRAY); - V_ARRAY(pvari) = CreateByteArray(&IID_IShellLink, sizeof(IID)); + V_ARRAY(pvari) = CreateByteArray(&IID_IShellLinkW, sizeof(IID)); return S_OK; } @@ -225,7 +225,7 @@ static void SHPropertyBag_ReadTest(void) ok_long(hr, S_OK); ok_int(s_cRead, 1); ok_int(s_cWrite, 0); - ok_int(IsEqualGUID(guid, IID_IShellLink), TRUE); + ok_int(IsEqualGUID(guid, IID_IShellLinkW), TRUE); ResetTest(VT_EMPTY, L"GUID2"); hr = SHPropertyBag_ReadGUID(&dummy, L"GUID2", &guid); @@ -456,9 +456,192 @@ static void SHPropertyBag_OnMemory(void) } } +static void SHPropertyBag_OnRegKey(void) +{ + HKEY hKey, hSubKey; + LONG error; + VARIANT vari; + WCHAR szText[MAX_PATH]; + IStream *pStream; + GUID guid; + BYTE guid_and_extra[sizeof(GUID) + sizeof(GUID)]; + + // Create HKCU\Software\ReactOS registry key + error = RegCreateKeyW(HKEY_CURRENT_USER, L"Software\\ReactOS", &hKey); + if (error) + { + skip("FAILED to create HKCU\\Software\\ReactOS\n"); + return; + } + + IPropertyBag *pPropBag; + HRESULT hr; + + // Try to create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", 0, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); + + // Try to create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_READWRITE, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)); + + // Create new registry key + RegDeleteKeyW(hKey, L"PropBagTest"); + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_CREATE | STGM_READWRITE, + IID_IPropertyBag, (void **)&pPropBag); + if (FAILED(hr)) + { + skip("SHCreatePropertyBagOnRegKey FAILED\n"); + RegCloseKey(hKey); + return; + } + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read UI4 + VariantInit(&vari); + hr = pPropBag->Read(L"Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Write BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + V_BSTR(&vari) = SysAllocString(L"StrValue"); + hr = pPropBag->Write(L"Name2", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read BSTR + VariantInit(&vari); + V_VT(&vari) = VT_BSTR; + hr = pPropBag->Read(L"Name2", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_BSTR); + ok_wstr(V_BSTR(&vari), L"StrValue"); + VariantClear(&vari); + + // Write GUID + VariantInit(&vari); + V_VT(&vari) = VT_UNKNOWN; + V_UNKNOWN(&vari) = SHCreateMemStream((BYTE*)&IID_IShellLinkW, sizeof(IID_IShellLinkW)); + hr = pPropBag->Write(L"Name4", &vari); + ok_long(hr, S_OK); + VariantClear(&vari); + + // Read GUID + VariantInit(&vari); + V_VT(&vari) = VT_EMPTY; + hr = pPropBag->Read(L"Name4", &vari, NULL); + if (IsWindowsVistaOrGreater()) + { + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UNKNOWN); + pStream = (IStream*)V_UNKNOWN(&vari); + FillMemory(&guid, sizeof(guid), 0xEE); + hr = pStream->Read(&guid, sizeof(guid), NULL); + ok_long(hr, S_OK); + ok_int(::IsEqualGUID(guid, IID_IShellLinkW), TRUE); + } + else // XP/2k3 Read is buggy + { + ok_long(hr, E_FAIL); + ok_long(V_VT(&vari), VT_EMPTY); + } + VariantClear(&vari); + + pPropBag->Release(); + + // Check registry + error = RegOpenKeyExW(hKey, L"PropBagTest", 0, KEY_READ, &hSubKey); + ok_long(error, ERROR_SUCCESS); + DWORD dwType, dwValue, cbValue = sizeof(dwValue); + error = RegQueryValueExW(hSubKey, L"Name1", NULL, &dwType, (BYTE*)&dwValue, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_DWORD); + ok_long(dwValue, 0xDEADFACE); + ok_long(cbValue, sizeof(DWORD)); + cbValue = sizeof(szText); + error = RegQueryValueExW(hSubKey, L"Name2", NULL, &dwType, (BYTE*)szText, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_SZ); + ok_wstr(szText, L"StrValue"); + cbValue = sizeof(guid_and_extra); + error = RegQueryValueExW(hSubKey, L"Name4", NULL, &dwType, (BYTE*)&guid_and_extra, &cbValue); + ok_long(error, ERROR_SUCCESS); + ok_long(dwType, REG_BINARY); + ok_int(memcmp(&guid_and_extra, &GUID_NULL, sizeof(GUID)), 0); + ok_int(memcmp(&guid_and_extra[sizeof(GUID)], &IID_IShellLinkW, sizeof(GUID)), 0); + RegCloseKey(hSubKey); + + // Create as read-only + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_READ, + IID_IPropertyBag, (void **)&pPropBag); + ok_long(hr, S_OK); + + // Read UI4 + VariantInit(&vari); + hr = pPropBag->Read(L"Name1", &vari, NULL); + ok_long(hr, S_OK); + ok_long(V_VT(&vari), VT_UI4); + ok_long(V_UI4(&vari), 0xDEADFACE); + VariantClear(&vari); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name1", &vari); + ok_long(hr, E_ACCESSDENIED); + VariantClear(&vari); + + pPropBag->Release(); + + // Create as write-only IPropertyBag2 + hr = SHCreatePropertyBagOnRegKey(hKey, L"PropBagTest", STGM_WRITE, + IID_IPropertyBag2, (void **)&pPropBag); + ok_long(hr, S_OK); + + // Write UI4 + VariantInit(&vari); + V_VT(&vari) = VT_UI4; + V_UI4(&vari) = 0xDEADFACE; + hr = pPropBag->Write(L"Name3", &vari); + ok_long(hr, E_NOTIMPL); + VariantClear(&vari); + + // Read UI4 + VariantInit(&vari); + V_UI4(&vari) = 0xFEEDF00D; + hr = pPropBag->Read(L"Name3", &vari, NULL); + ok_long(hr, E_NOTIMPL); + ok_int(V_VT(&vari), VT_EMPTY); + ok_long(V_UI4(&vari), 0xFEEDF00D); + VariantClear(&vari); + + pPropBag->Release(); + + // Clean up + RegDeleteKeyW(hKey, L"PropBagTest"); + RegCloseKey(hKey); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); SHPropertyBag_WriteTest(); SHPropertyBag_OnMemory(); + SHPropertyBag_OnRegKey(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 9ed45b2c8d5..29aae083047 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -91,6 +91,7 @@ BOOL WINAPI SHExpandEnvironmentStringsForUserW(HANDLE, LPCWSTR, LPWSTR, DWORD); BOOL WINAPI SHIsEmptyStream(IStream*); +HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize); HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); HRESULT WINAPI SHPropertyBag_ReadType(IPropertyBag *ppb, LPCWSTR pszPropName, VARIANTARG *pvarg, VARTYPE vt); HRESULT WINAPI SHPropertyBag_ReadBOOL(IPropertyBag *ppb, LPCWSTR pszPropName, BOOL *pbValue); @@ -126,6 +127,14 @@ HRESULT WINAPI SHPropertyBag_WriteRECTL(IPropertyBag *ppb, LPCWSTR pszPropName, HRESULT WINAPI SHCreatePropertyBagOnMemory(_In_ DWORD dwMode, _In_ REFIID riid, _Out_ void **ppvObj); +HRESULT WINAPI +SHCreatePropertyBagOnRegKey( + _In_ HKEY hKey, + _In_z_ LPCWSTR pszSubKey, + _In_ DWORD dwMode, + _In_ REFIID riid, + _Out_ void **ppvObj); + HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra);

1 year, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023