Ros-diffs

ros-diffs@reactos.org

19 participants
81091 discussions

[reactos] 03/03: [NTOS:MM] Use FORCEINLINE instead of simple inline

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57e018acf6cc75288a2f4… commit 57e018acf6cc75288a2f40b7341543140055a0ae Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 23:48:58 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [NTOS:MM] Use FORCEINLINE instead of simple inline inline implies an implementation must exist in another compilation unit --- ntoskrnl/include/internal/mm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index c7bf663d1c8..5e8ad09a861 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -868,7 +868,7 @@ MmDeleteKernelStack(PVOID Stack, /* balance.c / pagefile.c******************************************************/ -inline VOID UpdateTotalCommittedPages(LONG Delta) +FORCEINLINE VOID UpdateTotalCommittedPages(LONG Delta) { /* * Add up all the used "Committed" memory + pagefile. @@ -880,7 +880,7 @@ inline VOID UpdateTotalCommittedPages(LONG Delta) MiMemoryConsumers[MC_USER].PagesUsed + MiUsedSwapPages; */ - + /* Update Commitment */ SIZE_T TotalCommittedPages = InterlockedExchangeAddSizeT(&MmTotalCommittedPages, Delta) + Delta;

1 year, 5 months

[reactos] 02/03: [FRAMEDYN] Do not define GCC <-> MSVC aliases when building the DLL

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea331f074ce10d2b9c298… commit ea331f074ce10d2b9c298f7d6bbf43130aa83bf3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 23:48:05 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [FRAMEDYN] Do not define GCC <-> MSVC aliases when building the DLL This fixes some issue when compiling without optimizations on GCC --- dll/win32/framedyn/chstring.cpp | 2 ++ sdk/include/psdk/chstring.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/framedyn/chstring.cpp b/dll/win32/framedyn/chstring.cpp index 9f24a90ec2b..df2eacc65c1 100644 --- a/dll/win32/framedyn/chstring.cpp +++ b/dll/win32/framedyn/chstring.cpp @@ -24,6 +24,8 @@ /* INCLUDES ******************************************************************/ +#define CHSTRING_BUILD + #include <chstring.h> #define NDEBUG #include <debug.h> diff --git a/sdk/include/psdk/chstring.h b/sdk/include/psdk/chstring.h index a2994bc064b..384f40c8bbb 100644 --- a/sdk/include/psdk/chstring.h +++ b/sdk/include/psdk/chstring.h @@ -196,7 +196,7 @@ inline BOOL operator>=(const CHString& s1, CHSTRING_LPCWSTR s2) { return s1.Comp inline BOOL operator>=(const CHString& s1, const CHString& s2) { return s1.Compare(s2) >= 0; } /* Have GCC link to the symbols exported by framedyn.dll */ -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(CHSTRING_BUILD) #define DEFINE_FRAMEDYN_ALIAS(alias, orig) __asm__(".set " #alias ", \"" #orig "\"");

1 year, 5 months

[reactos] 01/03: [TXT2NLS] Explicitly include <cstdint>

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5508673dd518f4ce0b0f0… commit 5508673dd518f4ce0b0f08c8b2ce84b0d2a1a6f7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Jul 22 10:24:44 2023 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sun Jul 23 23:58:42 2023 +0200 [TXT2NLS] Explicitly include <cstdint> --- sdk/tools/txt2nls/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/txt2nls/main.cpp b/sdk/tools/txt2nls/main.cpp index 8d5c473914f..796066ecf9a 100644 --- a/sdk/tools/txt2nls/main.cpp +++ b/sdk/tools/txt2nls/main.cpp @@ -11,6 +11,7 @@ #include <vector> #include <cstring> #include <string> +#include <cstdint> static const char whitespaces[] = " \t\f\v\n\r"; static long line_number = -1;

1 year, 5 months

[reactos] 01/01: [DMILIB][UDMIHELP] Favor pragma once (#5472)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e387e246118446136eb9d… commit e387e246118446136eb9d088dd327bb823274b97 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jul 23 22:52:07 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jul 23 22:52:07 2023 +0200 [DMILIB][UDMIHELP] Favor pragma once (#5472) --- sdk/lib/dmilib/dmilib.h | 6 +----- sdk/lib/udmihelp/udmihelp.h | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sdk/lib/dmilib/dmilib.h b/sdk/lib/dmilib/dmilib.h index 203352db57d..f59f8ce7966 100644 --- a/sdk/lib/dmilib/dmilib.h +++ b/sdk/lib/dmilib/dmilib.h @@ -1,13 +1,11 @@ /* * PROJECT: ReactOS DMI/SMBIOS Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: dmilib.h * PURPOSE: SMBIOS table parsing functions * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#ifndef DMILIB_H -#define DMILIB_H +#pragma once enum _ID_STRINGS { @@ -35,5 +33,3 @@ ParseSMBiosTables( _In_reads_bytes_(TableSize) PVOID SMBiosTables, _In_ ULONG TableSize, _Inout_updates_(ID_STRINGS_MAX) PCHAR * Strings); - -#endif /* DMILIB_H */ diff --git a/sdk/lib/udmihelp/udmihelp.h b/sdk/lib/udmihelp/udmihelp.h index 27652229d9e..265332d8f9c 100644 --- a/sdk/lib/udmihelp/udmihelp.h +++ b/sdk/lib/udmihelp/udmihelp.h @@ -5,8 +5,7 @@ * COPYRIGHT: Copyright 2018 Stanislav Motylkov */ -#ifndef UDMIHELP_H -#define UDMIHELP_H +#pragma once #ifdef __cplusplus extern "C" { @@ -36,5 +35,3 @@ FreeSMBiosData( #ifdef __cplusplus } // extern "C" #endif - -#endif /* UDMIHELP_H */

1 year, 5 months

[reactos] 01/01: [IEFRAME] Improve Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b52c287d4244d88b9b2c… commit 7b52c287d4244d88b9b2cf424c2b3702c7966701 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jul 23 08:02:24 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jul 23 08:02:24 2023 +0900 [IEFRAME] Improve Japanese (ja-JP) translation CORE-18706 --- dll/win32/ieframe/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/ieframe/lang/ja-JP.rc b/dll/win32/ieframe/lang/ja-JP.rc index 36e4eca66e4..8643390d0d5 100644 --- a/dll/win32/ieframe/lang/ja-JP.rc +++ b/dll/win32/ieframe/lang/ja-JP.rc @@ -41,7 +41,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { IDS_INTERNET "インターネットブラウザ" - IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_INTERNET_DESCRIPTION "ウェブブラウザを開き、インターネットの情報を表示します。" IDS_TB_BACK "戻る" IDS_TB_FORWARD "進む"

1 year, 5 months

[reactos] 01/01: [IEFRAME] Sync translations with IDC_ICONS_INTERNET in shell32.dll

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00420aff1f143467e7a6b… commit 00420aff1f143467e7a6b4aebb31e1f86ec0e537 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jul 22 22:22:05 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jul 22 22:30:02 2023 +0300 [IEFRAME] Sync translations with IDC_ICONS_INTERNET in shell32.dll Also update Russian (ru-RU) translation. CORE-18625 --- dll/win32/ieframe/lang/fr-FR.rc | 2 +- dll/win32/ieframe/lang/hu-HU.rc | 2 +- dll/win32/ieframe/lang/ja-JP.rc | 2 +- dll/win32/ieframe/lang/pl-PL.rc | 2 +- dll/win32/ieframe/lang/pt-PT.rc | 2 +- dll/win32/ieframe/lang/ro-RO.rc | 2 +- dll/win32/ieframe/lang/ru-RU.rc | 4 ++-- dll/win32/ieframe/lang/tr-TR.rc | 2 +- dll/win32/ieframe/lang/zh-CN.rc | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/ieframe/lang/fr-FR.rc b/dll/win32/ieframe/lang/fr-FR.rc index 6fd596aaacb..9f4852a3219 100644 --- a/dll/win32/ieframe/lang/fr-FR.rc +++ b/dll/win32/ieframe/lang/fr-FR.rc @@ -40,7 +40,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Navigateur Internet" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Précédent" diff --git a/dll/win32/ieframe/lang/hu-HU.rc b/dll/win32/ieframe/lang/hu-HU.rc index e7224c60927..5c440461b66 100644 --- a/dll/win32/ieframe/lang/hu-HU.rc +++ b/dll/win32/ieframe/lang/hu-HU.rc @@ -40,7 +40,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Internet böngésző" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Vissza" diff --git a/dll/win32/ieframe/lang/ja-JP.rc b/dll/win32/ieframe/lang/ja-JP.rc index 1501e00aa46..36e4eca66e4 100644 --- a/dll/win32/ieframe/lang/ja-JP.rc +++ b/dll/win32/ieframe/lang/ja-JP.rc @@ -40,7 +40,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "インターネットブラウザ" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "戻る" diff --git a/dll/win32/ieframe/lang/pl-PL.rc b/dll/win32/ieframe/lang/pl-PL.rc index 6f9432f0ad8..16e089affe5 100644 --- a/dll/win32/ieframe/lang/pl-PL.rc +++ b/dll/win32/ieframe/lang/pl-PL.rc @@ -40,7 +40,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Przeglądarka internetowa" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Wstecz" diff --git a/dll/win32/ieframe/lang/pt-PT.rc b/dll/win32/ieframe/lang/pt-PT.rc index 33df448de07..5fd5b4bc168 100644 --- a/dll/win32/ieframe/lang/pt-PT.rc +++ b/dll/win32/ieframe/lang/pt-PT.rc @@ -40,7 +40,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Navegador de Internet" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Retroceder" diff --git a/dll/win32/ieframe/lang/ro-RO.rc b/dll/win32/ieframe/lang/ro-RO.rc index 6b12740d444..04296f436ab 100644 --- a/dll/win32/ieframe/lang/ro-RO.rc +++ b/dll/win32/ieframe/lang/ro-RO.rc @@ -42,7 +42,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Navigatorul de internet" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Înapoi" diff --git a/dll/win32/ieframe/lang/ru-RU.rc b/dll/win32/ieframe/lang/ru-RU.rc index 07f2e1c0b1e..e85d22710d4 100644 --- a/dll/win32/ieframe/lang/ru-RU.rc +++ b/dll/win32/ieframe/lang/ru-RU.rc @@ -42,8 +42,8 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" - IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_INTERNET "Интернет браузер" + IDS_INTERNET_DESCRIPTION "Открывает веб-браузер для поиска и отображения информации и веб-узлов в Интернете." IDS_TB_BACK "Назад" IDS_TB_FORWARD "Вперед" diff --git a/dll/win32/ieframe/lang/tr-TR.rc b/dll/win32/ieframe/lang/tr-TR.rc index d3e9544cc46..4b47427554f 100644 --- a/dll/win32/ieframe/lang/tr-TR.rc +++ b/dll/win32/ieframe/lang/tr-TR.rc @@ -42,7 +42,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "İnternet tarayıcısı" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "Geri" diff --git a/dll/win32/ieframe/lang/zh-CN.rc b/dll/win32/ieframe/lang/zh-CN.rc index 430d0648fec..9b4c1ec68ad 100644 --- a/dll/win32/ieframe/lang/zh-CN.rc +++ b/dll/win32/ieframe/lang/zh-CN.rc @@ -43,7 +43,7 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { - IDS_INTERNET "Internet Browser" + IDS_INTERNET "Internet浏览器" IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." IDS_TB_BACK "后退"

1 year, 6 months

[reactos] 01/01: [EXPLORER] Large taskbar icon support (#5465)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e8cf6ffd58cc7a46db8b… commit 0e8cf6ffd58cc7a46db8bfe46cfb361aceb15153 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sat Jul 22 09:24:28 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 18:24:28 2023 +0300 [EXPLORER] Large taskbar icon support (#5465) - Use HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced\TaskbarSmallIcons registry key to store the icon size setting for the taskbar. - If the registry value is missing, small icons will be used by default. - If the registry value is set to 1, it will also use small icons. - Only if the value exists and is set to 0 it will use large icons. This allows us to use the same registry value as Windows 7 explorer, while also keeping the taskbar icons small in most cases, especially running the shell on unmodified Windows Server 2003. CORE-11698 --- base/shell/explorer/precomp.h | 1 + base/shell/explorer/settings.cpp | 4 ++++ base/shell/explorer/taskswnd.cpp | 15 ++++++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 7f58465ad8e..91770090ef5 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -210,6 +210,7 @@ struct TaskbarSettings BOOL bShowSeconds; BOOL bPreferDate; BOOL bHideInactiveIcons; + BOOL bSmallIcons; TW_STRUCKRECTS2 sr; BOOL Load(); diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 9e6051eb9d7..4c6b3dd2633 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -31,6 +31,7 @@ BOOL TaskbarSettings::Save() BOOL bAllowSizeMove = !bLock; SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", REG_DWORD, &bAllowSizeMove, sizeof(bAllowSizeMove)); sr.cbSize = sizeof(sr); + SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons)); SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); /* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ @@ -57,6 +58,9 @@ BOOL TaskbarSettings::Load() dwRet = SHGetValueW(hkExplorer, NULL, L"EnableAutotray", NULL, &dwValue, &cbSize); bHideInactiveIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE; + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", NULL, &dwValue, &cbSize); + bSmallIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; + cbSize = sizeof(sr); dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 5437f4701f0..e58c99bc6df 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -494,7 +494,7 @@ public: #define GET_ICON(type) \ SendMessageTimeout(hwnd, WM_GETICON, (type), 0, SMTO_NOTIMEOUTIFNOTHUNG, 100, (PDWORD_PTR)&hIcon) - LRESULT bAlive = GET_ICON(ICON_SMALL2); + LRESULT bAlive = GET_ICON(g_TaskbarSettings.bSmallIcons ? ICON_SMALL2 : ICON_BIG); if (hIcon) return hIcon; @@ -507,7 +507,7 @@ public: if (bAlive) { - GET_ICON(ICON_BIG); + GET_ICON(g_TaskbarSettings.bSmallIcons ? ICON_BIG : ICON_SMALL2); if (hIcon) return hIcon; } @@ -1262,9 +1262,12 @@ public: /* Update the size of the image list if needed */ int cx, cy; ImageList_GetIconSize(m_ImageList, &cx, &cy); - if (cx != GetSystemMetrics(SM_CXSMICON) || cy != GetSystemMetrics(SM_CYSMICON)) + if (cx != GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CXSMICON : SM_CXICON) || + cy != GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CYSMICON : SM_CYICON)) { - ImageList_SetIconSize(m_ImageList, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); + ImageList_SetIconSize(m_ImageList, + GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CXSMICON : SM_CXICON), + GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CYSMICON : SM_CYICON)); /* SetIconSize removes all icons so we have to reinsert them */ PTASK_ITEM TaskItem = m_TaskItems; @@ -1430,7 +1433,9 @@ public: SetWindowTheme(m_TaskBar.m_hWnd, L"TaskBand", NULL); - m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); + m_ImageList = ImageList_Create(GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CXSMICON : SM_CXICON), + GetSystemMetrics(g_TaskbarSettings.bSmallIcons ? SM_CYSMICON : SM_CYICON), + ILC_COLOR32 | ILC_MASK, 0, 1000); m_TaskBar.SetImageList(m_ImageList); /* Set proper spacing between buttons */

1 year, 6 months

[reactos] 01/01: [BROWSEUI] Add an option to use full folder path in the window title (#5468)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d37456542a71f64b58ab… commit 6d37456542a71f64b58ab5a16833aa9e048fcb1b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sat Jul 22 08:50:39 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 17:50:39 2023 +0300 [BROWSEUI] Add an option to use full folder path in the window title (#5468) - Set `HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState\FullPath` to 0 by default. Adding this registry value also enables the "Display the full path in the title bar" option in our folder options window. - Query the same registry key when the file explorer is started to determine whether to use the full path or the display name in the window title. CORE-19046 CORE-18904 --- boot/bootdata/hivedef.inf | 2 ++ dll/win32/browseui/shellbrowser.cpp | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 2b7a2c53c47..6394246fad9 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1899,6 +1899,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLog ; "Hidden" to be changed to 2 if we later want to have "Hide hidden files by default" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ShowSuperHidden",0x00010003,0 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CabinetState","FullPath",0x00010003,0 HKCU,"SOFTWARE\Microsoft\Internet Explorer\Main","StatusBarOther",0x00010003,1 ; ComDlg32 diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 71068d22ef4..fb4c1ccc59b 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -350,6 +350,7 @@ public: HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); + void LoadSettings(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -709,10 +710,6 @@ CShellBrowser::CShellBrowser() fCurrentShellViewWindow = NULL; fCurrentDirectoryPIDL = NULL; fStatusBar = NULL; - fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", - L"StatusBarOther", - FALSE, - FALSE); fCurrentMenuBar = NULL; fHistoryObject = NULL; fHistoryStream = NULL; @@ -786,6 +783,7 @@ HRESULT CShellBrowser::Initialize() fToolbarProxy.Initialize(m_hWnd, clientBar); + LoadSettings(); // create status bar DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; @@ -1510,6 +1508,19 @@ void CShellBrowser::RepositionBars() clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); } +void CShellBrowser::LoadSettings() +{ + fStatusBarVisible = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", + L"StatusBarOther", + FALSE, + FALSE); + + fCabinetState.fFullPathTitle = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", + L"FullPath", + FALSE, + FALSE); +} + HRESULT CShellBrowser::FireEvent(DISPID dispIdMember, int argCount, VARIANT *arguments) { DISPPARAMS params;

1 year, 6 months

[reactos] 01/01: [APPWIZ] Add locking in access of download_binding (#5463)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f85b8fb564d98e77bc8e6… commit f85b8fb564d98e77bc8e6eb5b7dc7aa1acb51603 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 22 22:18:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 22:18:31 2023 +0900 [APPWIZ] Add locking in access of download_binding (#5463) The pointer variable download_binding is used in multiple threads. I thought it needs locking before accessing. CORE-15786 --- dll/cpl/appwiz/addons.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c index ae51aa4849a..5a3c11e9add 100644 --- a/dll/cpl/appwiz/addons.c +++ b/dll/cpl/appwiz/addons.c @@ -59,6 +59,7 @@ static const addon_info_t addons_info[] = { static const addon_info_t *addon; static HWND install_dialog = NULL; +static CRITICAL_SECTION csLock; static IBinding *download_binding = NULL; static WCHAR GeckoUrl[] = L"https://svn.reactos.org/amine/wine_gecko-2.40-x86.msi"; @@ -260,8 +261,12 @@ static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { set_status(IDS_DOWNLOADING); + IBinding_AddRef(pib); + + EnterCriticalSection(&csLock); download_binding = pib; + LeaveCriticalSection(&csLock); return S_OK; } @@ -294,10 +299,12 @@ static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULO static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { + EnterCriticalSection(&csLock); if(download_binding) { IBinding_Release(download_binding); download_binding = NULL; } + LeaveCriticalSection(&csLock); if(FAILED(hresult)) { if(hresult == E_ABORT) @@ -401,12 +408,14 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_COMMAND: switch(wParam) { case IDCANCEL: + EnterCriticalSection(&csLock); if(download_binding) { IBinding_Abort(download_binding); } else { EndDialog(hwnd, 0); } + LeaveCriticalSection(&csLock); return FALSE; case ID_DWL_INSTALL: @@ -436,6 +445,8 @@ BOOL install_addon(addon_t addon_type, HWND hwnd_parent) addon = addons_info + addon_type; + InitializeCriticalSection(&csLock); + /* * Try to find addon .msi file in following order: * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key @@ -444,5 +455,7 @@ BOOL install_addon(addon_t addon_type, HWND hwnd_parent) if (install_from_registered_dir() == INSTALL_NEXT) DialogBoxW(hApplet, addon->dialog_template, hwnd_parent, installer_proc); + DeleteCriticalSection(&csLock); + return TRUE; }

1 year, 6 months

[reactos] 01/01: [IEXPLORE][IEFRAME][SHELL32] Add Internet icon on Desktop (#5451)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52bc5f7c5df5eaf48b22f… commit 52bc5f7c5df5eaf48b22f6089f7415bc8857543d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jul 22 19:28:37 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 22 19:28:37 2023 +0900 [IEXPLORE][IEFRAME][SHELL32] Add Internet icon on Desktop (#5451) - Add Internet icon on Desktop. You can hide/show the icon from Desktop's customization. - Modify "HKCR\CLSID\%CLSID_Internet%" registry key. - Add IDS_INTERNET and IDS_INTERNET_DESCRITION into ieframe.dll. - Modify folders/CDesktopFolder.cpp and folders/CRegFolder.cpp to add the icon. CORE-18625 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> Co-authored-by: Joachim Henze <joachim.henze(a)reactos.org> --- base/applications/iexplore/CMakeLists.txt | 4 +++- base/applications/iexplore/iexplore.inf | 14 ++++++++++---- dll/win32/ieframe/CMakeLists.txt | 2 ++ dll/win32/ieframe/ieframe_v1.rgs | 14 +++++++++++++- dll/win32/ieframe/lang/cs-CZ.rc | 3 +++ dll/win32/ieframe/lang/de-DE.rc | 3 +++ dll/win32/ieframe/lang/en-US.rc | 3 +++ dll/win32/ieframe/lang/es-ES.rc | 3 +++ dll/win32/ieframe/lang/fr-FR.rc | 3 +++ dll/win32/ieframe/lang/hu-HU.rc | 3 +++ dll/win32/ieframe/lang/id-ID.rc | 3 +++ dll/win32/ieframe/lang/it-IT.rc | 3 +++ dll/win32/ieframe/lang/ja-JP.rc | 3 +++ dll/win32/ieframe/lang/pl-PL.rc | 3 +++ dll/win32/ieframe/lang/pt-PT.rc | 3 +++ dll/win32/ieframe/lang/ro-RO.rc | 3 +++ dll/win32/ieframe/lang/ru-RU.rc | 3 +++ dll/win32/ieframe/lang/tr-TR.rc | 3 +++ dll/win32/ieframe/lang/zh-CN.rc | 3 +++ dll/win32/ieframe/lang/zh-TW.rc | 3 +++ dll/win32/ieframe/resource.h | 3 +++ dll/win32/shell32/folders/CDesktopFolder.cpp | 3 +++ dll/win32/shell32/folders/CRegFolder.cpp | 3 +++ 23 files changed, 85 insertions(+), 6 deletions(-) diff --git a/base/applications/iexplore/CMakeLists.txt b/base/applications/iexplore/CMakeLists.txt index b25b1d9b48d..9a17e61c6c4 100644 --- a/base/applications/iexplore/CMakeLists.txt +++ b/base/applications/iexplore/CMakeLists.txt @@ -1,5 +1,7 @@ -add_rc_deps(iexplore.rc ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico) +add_rc_deps(iexplore.rc + ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico + ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.inf) add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index e88cead039d..ee7d404e792 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -16,10 +16,16 @@ HKCR,"CLSID\%CLSID_InternetExplorer%\LocalServer32",,,"""%16422%\Internet Explor HKCR,"CLSID\%CLSID_InternetExplorer%\ProgID",,,"InternetExplorer.Application.1" HKCR,"CLSID\%CLSID_InternetExplorer%\VersionIndependentProgID",,,"InternetExplorer.Application" -HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,,"shdoclc.dll,-190" -HKCR,"CLSID\%CLSID_Internet%\Shell",,,"OpenHomePage" -HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" -HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" +; FIXME: Implement CLSID_Internet in ieframe.dll (see CORE-18625) +; https://git.reactos.org/?p=reactos.git;a=blob;f=modules/rostests/apitests/c… +HKCR,"CLSID\%CLSID_Internet%",,,"Internet Browser" +HKCR,"CLSID\%CLSID_Internet%","InfoTip",0x00020000,"@%SystemRoot%\system32\ieframe.dll,-881" +HKCR,"CLSID\%CLSID_Internet%","LocalizedString",0x00020000,"@%SystemRoot%\system32\ieframe.dll,-880" +HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,0x00020000,"%SystemRoot%\system32\shell32.dll,-512" +; FIXME: should be "OpenHomePage" action +HKCR,"CLSID\%CLSID_Internet%\Shell",,,"open" +HKCR,"CLSID\%CLSID_Internet%\Shell\open",,,"" +HKCR,"CLSID\%CLSID_Internet%\Shell\open\Command",,,"rundll32.exe url,OpenURL https://google.com" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe"" -startmanager" diff --git a/dll/win32/ieframe/CMakeLists.txt b/dll/win32/ieframe/CMakeLists.txt index cdd58efb6e7..830a3f5b9c3 100644 --- a/dll/win32/ieframe/CMakeLists.txt +++ b/dll/win32/ieframe/CMakeLists.txt @@ -35,6 +35,8 @@ add_typelib(ieframe_v1.idl) list(APPEND ieframe_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/ieframe.rgs ${CMAKE_CURRENT_SOURCE_DIR}/ieframe_v1.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/resources/ietoolbar.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/resources/pages.ico ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS "${ieframe_rc_deps}") diff --git a/dll/win32/ieframe/ieframe_v1.rgs b/dll/win32/ieframe/ieframe_v1.rgs index 8e124912c56..388f1fe0427 100644 --- a/dll/win32/ieframe/ieframe_v1.rgs +++ b/dll/win32/ieframe/ieframe_v1.rgs @@ -5,9 +5,21 @@ HKCR } NoRemove CLSID { - '{871C5380-42A0-1069-A2EA-08002B30309D}' = s 'Internet' + '{871C5380-42A0-1069-A2EA-08002B30309D}' = s 'Internet Browser' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + Shellex = s '' + { + ContextMenuHandlers = s '' + { + ieframe = s '{871C5380-42A0-1069-A2EA-08002B30309D}' + { + } + } + MayChangeDefaultMenu = s '' + { + } + } } '{3C374A40-BAE4-11CF-BF7D-00AA006946EE}' = s 'Microsoft Url History Service' { diff --git a/dll/win32/ieframe/lang/cs-CZ.rc b/dll/win32/ieframe/lang/cs-CZ.rc index 30b5ee547af..c46500c0423 100644 --- a/dll/win32/ieframe/lang/cs-CZ.rc +++ b/dll/win32/ieframe/lang/cs-CZ.rc @@ -45,6 +45,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Zpět" IDS_TB_FORWARD "Vpřed" IDS_TB_STOP "Stop" diff --git a/dll/win32/ieframe/lang/de-DE.rc b/dll/win32/ieframe/lang/de-DE.rc index 823aad7de9e..bda8f635b2d 100644 --- a/dll/win32/ieframe/lang/de-DE.rc +++ b/dll/win32/ieframe/lang/de-DE.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Zurück" IDS_TB_FORWARD "Vorwärts" IDS_TB_STOP "Stop" diff --git a/dll/win32/ieframe/lang/en-US.rc b/dll/win32/ieframe/lang/en-US.rc index 088458dc344..7df6eda4745 100644 --- a/dll/win32/ieframe/lang/en-US.rc +++ b/dll/win32/ieframe/lang/en-US.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Back" IDS_TB_FORWARD "Forward" IDS_TB_STOP "Stop" diff --git a/dll/win32/ieframe/lang/es-ES.rc b/dll/win32/ieframe/lang/es-ES.rc index 66c8ea67e5d..dd7ff32ce4f 100644 --- a/dll/win32/ieframe/lang/es-ES.rc +++ b/dll/win32/ieframe/lang/es-ES.rc @@ -42,6 +42,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Atrás" IDS_TB_FORWARD "Adelante" IDS_TB_STOP "Detener" diff --git a/dll/win32/ieframe/lang/fr-FR.rc b/dll/win32/ieframe/lang/fr-FR.rc index 42465f831e6..6fd596aaacb 100644 --- a/dll/win32/ieframe/lang/fr-FR.rc +++ b/dll/win32/ieframe/lang/fr-FR.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Précédent" IDS_TB_FORWARD "Suivant" IDS_TB_STOP "Arrêter" diff --git a/dll/win32/ieframe/lang/hu-HU.rc b/dll/win32/ieframe/lang/hu-HU.rc index 000857b8428..e7224c60927 100644 --- a/dll/win32/ieframe/lang/hu-HU.rc +++ b/dll/win32/ieframe/lang/hu-HU.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Vissza" IDS_TB_FORWARD "Előre" IDS_TB_STOP "Leállítás" diff --git a/dll/win32/ieframe/lang/id-ID.rc b/dll/win32/ieframe/lang/id-ID.rc index 6eb1d09f9c7..3806fae54e6 100644 --- a/dll/win32/ieframe/lang/id-ID.rc +++ b/dll/win32/ieframe/lang/id-ID.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Kembali" IDS_TB_FORWARD "Maju" IDS_TB_STOP "Berhenti" diff --git a/dll/win32/ieframe/lang/it-IT.rc b/dll/win32/ieframe/lang/it-IT.rc index 97da1705e02..4d53a09ad1e 100644 --- a/dll/win32/ieframe/lang/it-IT.rc +++ b/dll/win32/ieframe/lang/it-IT.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Indietro" IDS_TB_FORWARD "Avanti" IDS_TB_STOP "Interrompi" diff --git a/dll/win32/ieframe/lang/ja-JP.rc b/dll/win32/ieframe/lang/ja-JP.rc index a9cc0035a7a..1501e00aa46 100644 --- a/dll/win32/ieframe/lang/ja-JP.rc +++ b/dll/win32/ieframe/lang/ja-JP.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "戻る" IDS_TB_FORWARD "進む" IDS_TB_STOP "停止" diff --git a/dll/win32/ieframe/lang/pl-PL.rc b/dll/win32/ieframe/lang/pl-PL.rc index d94e2de120f..6f9432f0ad8 100644 --- a/dll/win32/ieframe/lang/pl-PL.rc +++ b/dll/win32/ieframe/lang/pl-PL.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Wstecz" IDS_TB_FORWARD "Dalej" IDS_TB_STOP "Zatrzymaj" diff --git a/dll/win32/ieframe/lang/pt-PT.rc b/dll/win32/ieframe/lang/pt-PT.rc index 65c7e3de8b5..33df448de07 100644 --- a/dll/win32/ieframe/lang/pt-PT.rc +++ b/dll/win32/ieframe/lang/pt-PT.rc @@ -40,6 +40,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Retroceder" IDS_TB_FORWARD "Avançar" IDS_TB_STOP "Parar" diff --git a/dll/win32/ieframe/lang/ro-RO.rc b/dll/win32/ieframe/lang/ro-RO.rc index 14e3cc83c00..6b12740d444 100644 --- a/dll/win32/ieframe/lang/ro-RO.rc +++ b/dll/win32/ieframe/lang/ro-RO.rc @@ -42,6 +42,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Înapoi" IDS_TB_FORWARD "Înainte" IDS_TB_STOP "Oprește" diff --git a/dll/win32/ieframe/lang/ru-RU.rc b/dll/win32/ieframe/lang/ru-RU.rc index 26c297792d6..07f2e1c0b1e 100644 --- a/dll/win32/ieframe/lang/ru-RU.rc +++ b/dll/win32/ieframe/lang/ru-RU.rc @@ -42,6 +42,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Назад" IDS_TB_FORWARD "Вперед" IDS_TB_STOP "Остановить" diff --git a/dll/win32/ieframe/lang/tr-TR.rc b/dll/win32/ieframe/lang/tr-TR.rc index 1dfc7aeaca1..d3e9544cc46 100644 --- a/dll/win32/ieframe/lang/tr-TR.rc +++ b/dll/win32/ieframe/lang/tr-TR.rc @@ -42,6 +42,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "Geri" IDS_TB_FORWARD "İleri" IDS_TB_STOP "Dur" diff --git a/dll/win32/ieframe/lang/zh-CN.rc b/dll/win32/ieframe/lang/zh-CN.rc index 516a436231c..430d0648fec 100644 --- a/dll/win32/ieframe/lang/zh-CN.rc +++ b/dll/win32/ieframe/lang/zh-CN.rc @@ -43,6 +43,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "后退" IDS_TB_FORWARD "前进" IDS_TB_STOP "停止" diff --git a/dll/win32/ieframe/lang/zh-TW.rc b/dll/win32/ieframe/lang/zh-TW.rc index 904ce82b982..732aee20447 100644 --- a/dll/win32/ieframe/lang/zh-TW.rc +++ b/dll/win32/ieframe/lang/zh-TW.rc @@ -49,6 +49,9 @@ IDR_BROWSE_MAIN_MENU MENU STRINGTABLE { + IDS_INTERNET "Internet Browser" + IDS_INTERNET_DESCRIPTION "Opens a Web browser and displays information on the Internet." + IDS_TB_BACK "上一頁" IDS_TB_FORWARD "下一頁" IDS_TB_STOP "停止" diff --git a/dll/win32/ieframe/resource.h b/dll/win32/ieframe/resource.h index 00c79beee72..1e51753f864 100644 --- a/dll/win32/ieframe/resource.h +++ b/dll/win32/ieframe/resource.h @@ -55,6 +55,9 @@ #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000 +#define IDS_INTERNET 880 +#define IDS_INTERNET_DESCRIPTION 881 + #define IDS_TB_BACK 1100 #define IDS_TB_FORWARD 1101 #define IDS_TB_STOP 1102 diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 8aa1e089fff..d1fafa88b5c 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -129,6 +129,7 @@ class CDesktopFolderEnum : LPITEMIDLIST pidl; static const WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; + static const WCHAR InternetClassString[] = L"{871C5380-42A0-1069-A2EA-08002B30309D}"; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); @@ -138,6 +139,8 @@ class CDesktopFolderEnum : AddToEnumList(_ILCreateMyComputer()); if (IsNamespaceExtensionHidden(MyDocumentsClassString) < 1) AddToEnumList(_ILCreateMyDocuments()); + if (IsNamespaceExtensionHidden(InternetClassString) < 1) + AddToEnumList(_ILCreateIExplore()); DWORD dwFetched; while((S_OK == pRegEnumerator->Next(1, &pidl, &dwFetched)) && dwFetched) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index eea529de235..16b0b7325e2 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -185,12 +185,15 @@ HRESULT CGuidItemExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID iid, LPVO } else { + // FIXME: Delete these hacks and make HCR_GetIconW and registry working if (IsEqualGUID(*riid, CLSID_MyComputer)) initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_COMPUTER); else if (IsEqualGUID(*riid, CLSID_MyDocuments)) initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_DOCUMENTS); else if (IsEqualGUID(*riid, CLSID_NetworkPlaces)) initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_MY_NETWORK_PLACES); + else if (IsEqualGUID(*riid, CLSID_Internet)) + initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_WEB_BROWSER); else initIcon->SetNormalIcon(swShell32Name, -IDI_SHELL_FOLDER); }

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs