Ros-diffs

ros-diffs@reactos.org

12 participants
81031 discussions

[reactos] 01/01: [SETUPAPI] CM_Request_Device_Eject_ExA/W: Fix pszVetoName buffer size validation (#5943)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f346b1aa350942540c7d… commit 7f346b1aa350942540c7dee9fce3869bea2a72a6 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Wed Nov 22 08:58:27 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 22 08:58:27 2023 +0700 [SETUPAPI] CM_Request_Device_Eject_ExA/W: Fix pszVetoName buffer size validation (#5943) - Return CR_INVALID_POINTER if pszVetoName is NULL and ulNameLength is not zero - CM_Request_Device_Eject_ExA: Allow ulNameLength to be zero when pszVetoName is not NULL Verified with Windows 2003 SP2. --- dll/win32/setupapi/cfgmgr.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 4a4e18ad621..3ab1d6969ce 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7483,22 +7483,25 @@ CM_Request_Device_Eject_ExA( _In_ ULONG ulFlags, _In_opt_ HMACHINE hMachine) { - LPWSTR lpLocalVetoName; + LPWSTR lpLocalVetoName = NULL; CONFIGRET ret; TRACE("CM_Request_Device_Eject_ExA(%lx %p %s %lu %lx %p)\n", dnDevInst, pVetoType, debugstr_a(pszVetoName), ulNameLength, ulFlags, hMachine); - if (pszVetoName == NULL && ulNameLength == 0) - return CR_INVALID_POINTER; + if (ulNameLength != 0) + { + if (pszVetoName == NULL) + return CR_INVALID_POINTER; - lpLocalVetoName = HeapAlloc(GetProcessHeap(), 0, ulNameLength * sizeof(WCHAR)); - if (lpLocalVetoName == NULL) - return CR_OUT_OF_MEMORY; + lpLocalVetoName = HeapAlloc(GetProcessHeap(), 0, ulNameLength * sizeof(WCHAR)); + if (lpLocalVetoName == NULL) + return CR_OUT_OF_MEMORY; + } ret = CM_Request_Device_Eject_ExW(dnDevInst, pVetoType, lpLocalVetoName, ulNameLength, ulFlags, hMachine); - if (ret == CR_REMOVE_VETOED) + if (ret == CR_REMOVE_VETOED && ulNameLength != 0) { if (WideCharToMultiByte(CP_ACP, 0, @@ -7544,7 +7547,7 @@ CM_Request_Device_Eject_ExW( if (ulFlags != 0) return CR_INVALID_FLAG; - if (pszVetoName == NULL && ulNameLength == 0) + if (pszVetoName == NULL && ulNameLength != 0) return CR_INVALID_POINTER; if (hMachine != NULL)

1 year, 1 month

[reactos] 02/02: [PSDK] Minor cleanup and fixes in headers

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9578bae85848fdda94e00… commit 9578bae85848fdda94e00d4598430ba878c3e235 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 21 22:01:55 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 21 22:23:55 2023 +0100 [PSDK] Minor cleanup and fixes in headers - Remove nonsensical XFree86 stuff; - Add missing #ifndef NORESOURCE around RT_* defines. --- sdk/include/psdk/basetsd.h | 2 -- sdk/include/psdk/winbase.h | 2 -- sdk/include/psdk/winuser.h | 13 +++++++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sdk/include/psdk/basetsd.h b/sdk/include/psdk/basetsd.h index 29b1026d97c..7d3efc04725 100644 --- a/sdk/include/psdk/basetsd.h +++ b/sdk/include/psdk/basetsd.h @@ -119,9 +119,7 @@ typedef unsigned long HANDLE_PTR; extern "C" { #endif typedef int LONG32, *PLONG32; -#ifndef XFree86Server typedef int INT32, *PINT32; -#endif /* ndef XFree86Server */ typedef unsigned int ULONG32, *PULONG32; typedef unsigned int DWORD32, *PDWORD32; typedef unsigned int UINT32, *PUINT32; diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 1a7be3db656..ca5fd2a3c58 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -2032,9 +2032,7 @@ BOOL WINAPI FreeLibrary(HMODULE); DECLSPEC_NORETURN void WINAPI FreeLibraryAndExitThread(HMODULE,DWORD); #define FreeModule(m) FreeLibrary(m) #define FreeProcInstance(p) (void)(p) -#ifndef XFree86Server BOOL WINAPI FreeResource(HGLOBAL); -#endif /* ndef XFree86Server */ PVOID WINAPI FreeSid(PSID); BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS); diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index c3978697e3f..5f956a66239 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -593,16 +593,17 @@ extern "C" { #endif /* WINE_NO_UNICODE_MACROS */ #endif /* !RC_INVOKED */ -#ifndef XFree86Server -# define RT_CURSOR MAKEINTRESOURCE(1) -# define RT_FONT MAKEINTRESOURCE(8) -#endif /* ndef XFree86Server */ + +#ifndef NORESOURCE + +#define RT_CURSOR MAKEINTRESOURCE(1) #define RT_BITMAP MAKEINTRESOURCE(2) #define RT_ICON MAKEINTRESOURCE(3) #define RT_MENU MAKEINTRESOURCE(4) #define RT_DIALOG MAKEINTRESOURCE(5) #define RT_STRING MAKEINTRESOURCE(6) #define RT_FONTDIR MAKEINTRESOURCE(7) +#define RT_FONT MAKEINTRESOURCE(8) #define RT_ACCELERATOR MAKEINTRESOURCE(9) #define RT_RCDATA MAKEINTRESOURCE(10) #define RT_MESSAGETABLE MAKEINTRESOURCE(11) @@ -627,6 +628,10 @@ extern "C" { #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2 #define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3 #endif + +#endif /* !NORESOURCE */ + + #define EWX_FORCE 0x00000004 #define EWX_LOGOFF 0 #define EWX_POWEROFF 0x00000008

1 year, 1 month

[reactos] 01/02: [NTDLL] Fix long vs. ptr in some Ldr* exports

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16b4c9ff3c183bd88b01a… commit 16b4c9ff3c183bd88b01ad43ecb3ebb3339b4c60 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 21 22:19:43 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 21 22:23:54 2023 +0100 [NTDLL] Fix long vs. ptr in some Ldr* exports --- dll/ntdll/def/ntdll.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index b7659f042d5..0dec2c84c88 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -133,23 +133,23 @@ @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME @ stdcall KiUserExceptionDispatcher(ptr ptr) @ stdcall -version=0x502 LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr) -@ stdcall LdrAccessResource(long ptr ptr ptr) +@ stdcall LdrAccessResource(ptr ptr ptr ptr) @ stdcall -stub -version=0x600+ LdrAddLoadAsDataTable(ptr wstr long ptr) @ stdcall LdrAddRefDll(long ptr) @ stdcall -version=0x502 LdrAlternateResourcesEnabled() @ stdcall -version=0x502 LdrCreateOutOfProcessImage(long ptr ptr ptr) @ stdcall -version=0x502 LdrDestroyOutOfProcessImage(ptr) -@ stdcall LdrDisableThreadCalloutsForDll(long) +@ stdcall LdrDisableThreadCalloutsForDll(ptr) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) -@ stdcall LdrEnumerateLoadedModules(long ptr long) +@ stdcall LdrEnumerateLoadedModules(long ptr ptr) @ stdcall -version=0x501-0x502 LdrFindCreateProcessManifest(long ptr ptr long ptr) @ stdcall LdrFindEntryForAddress(ptr ptr) -@ stdcall LdrFindResourceDirectory_U(long ptr long ptr) +@ stdcall LdrFindResourceDirectory_U(ptr ptr long ptr) @ stdcall -stub LdrFindResourceEx_U(ptr ptr ptr ptr ptr) ; 5.1 and higher -@ stdcall LdrFindResource_U(long ptr long ptr) +@ stdcall LdrFindResource_U(ptr ptr long ptr) @ stdcall LdrFlushAlternateResourceModules() -@ stdcall LdrGetDllHandle(wstr long ptr ptr) -@ stdcall LdrGetDllHandleEx(long wstr long ptr ptr) +@ stdcall LdrGetDllHandle(wstr ptr ptr ptr) +@ stdcall LdrGetDllHandleEx(long wstr ptr ptr ptr) @ stub -version=0x600+ LdrGetFailureData @ stdcall -stub -version=0x600+ LdrGetFileNameFromLoadAsDataTable(ptr ptr) @ stdcall -stub -version=0x600+ -arch=x86_64 LdrGetKnownDllSectionHandle(wstr long ptr)

1 year, 1 month

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60c770db67c60f0229728… commit 60c770db67c60f022972887f63936caf12db2206 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 21 10:46:57 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 21 10:46:57 2023 +0900 [SHELL32] Improve Japanese (ja-JP) translation Just fix IDS_ANY_FILE. CORE-18706 --- dll/win32/shell32/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 7cf8c34729f..13dc215929b 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -948,7 +948,7 @@ BEGIN IDS_SCR_FILE "スクリーンセーバー" IDS_SYS_FILE "システムファイル" IDS_VXD_FILE "仮想デバイスドライバ" - IDS_ANY_FILE "%s-ファイル" + IDS_ANY_FILE "%s ファイル" IDS_OPEN_VERB "開く" IDS_EXPLORE_VERB "エクスプローラで開く"

1 year, 1 month

[reactos] 01/01: [NETCFGX] Half-implement TCP/IP alternate configuration (#6009)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a95863b1320b3735ab526… commit a95863b1320b3735ab52669e7c9d615a1b084ec3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 21 06:16:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 21 06:16:39 2023 +0900 [NETCFGX] Half-implement TCP/IP alternate configuration (#6009) Based on KRosUser's netcfx_alt.patch. - Remove WS_GROUP flag of IDC_NODHCP control. - Fix the extent of a groupbox. - Half-implement TcpipAltConfDlg function. CORE-19331 --- dll/win32/netcfgx/lang/bg-BG.rc | 4 +- dll/win32/netcfgx/lang/cs-CZ.rc | 4 +- dll/win32/netcfgx/lang/da-DK.rc | 4 +- dll/win32/netcfgx/lang/de-DE.rc | 4 +- dll/win32/netcfgx/lang/el-GR.rc | 4 +- dll/win32/netcfgx/lang/en-US.rc | 4 +- dll/win32/netcfgx/lang/es-ES.rc | 4 +- dll/win32/netcfgx/lang/fr-FR.rc | 6 +- dll/win32/netcfgx/lang/he-IL.rc | 4 +- dll/win32/netcfgx/lang/hu-HU.rc | 4 +- dll/win32/netcfgx/lang/id-ID.rc | 4 +- dll/win32/netcfgx/lang/it-IT.rc | 4 +- dll/win32/netcfgx/lang/ja-JP.rc | 4 +- dll/win32/netcfgx/lang/nl-NL.rc | 4 +- dll/win32/netcfgx/lang/no-NO.rc | 4 +- dll/win32/netcfgx/lang/pl-PL.rc | 4 +- dll/win32/netcfgx/lang/pt-PT.rc | 4 +- dll/win32/netcfgx/lang/ro-RO.rc | 4 +- dll/win32/netcfgx/lang/ru-RU.rc | 4 +- dll/win32/netcfgx/lang/sk-SK.rc | 4 +- dll/win32/netcfgx/lang/sq-AL.rc | 4 +- dll/win32/netcfgx/lang/sv-SE.rc | 4 +- dll/win32/netcfgx/lang/tr-TR.rc | 4 +- dll/win32/netcfgx/lang/uk-UA.rc | 4 +- dll/win32/netcfgx/lang/zh-CN.rc | 4 +- dll/win32/netcfgx/lang/zh-HK.rc | 4 +- dll/win32/netcfgx/lang/zh-TW.rc | 4 +- dll/win32/netcfgx/tcpipconf_notify.c | 170 +++++++++++++++++++++++++++++------ 28 files changed, 199 insertions(+), 81 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 82ec4f5af78..65e25083d54 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ако компютърът се използва в повече от една мрежа, въведете заместващи IP настройки отдолу", -1, 9, 9, 220, 20 CONTROL "&Автоматични лични IP адреси", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Адрес за IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Под&мрежова маска:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index da3d3f4aebe..e3de3d634ee 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -35,8 +35,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pokud je tento počítač používán ve více než jedné síti, lze zadat alternativní nastavení níže", -1, 9, 9, 220, 20 CONTROL "Au&tomatická privátní IP adresa", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP adresa:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "&Maska podsítě:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index f344cb24bb5..7f1eb05fea9 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index c3c4af4c9c9..a848d8dadba 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Geben Sie alternative IP-Einstellungen an, falls dieser Computer in mehreren Netzwerken verwendet wird.", -1, 9, 9, 220, 20 CONTROL "Au&tomatisch zugewiesene, private IP-Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnetzmaske:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index 5ca96fd1e84..791bcb4f3c7 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index 80583ce62f4..b2533c81dbe 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 7ba13586b57..957f0a9e246 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -40,8 +40,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Escriba a continuación la configuración IP alternativa si este equipo se utiliza en más de una red.", -1, 9, 9, 220, 20 CONTROL "&Dirección IP privada automática", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 130, BS_GROUPBOX - CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 100, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Configurada por el u&suario:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 100, 12 LTEXT "Dire&cción IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75, 85, 12 LTEXT "Máscara de s&ubred:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 26f88406c9a..4725ee8c40d 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -31,9 +31,9 @@ CAPTION "Configuration alternative" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Si cet ordinateur est utilisé sur plusieurs réseaux, entrez les paramètres alternatifs IP ci-dessous", -1, 9, 9, 220, 20 - CONTROL "Adresse IP privée au&tomatique", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Utili&sateur configuré", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adresse &IP :", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Masque de so&us-réseau :", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index 73f291c967a..ea4651fee7d 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "כתובת IP פרטית אוטומטית", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "כתובת IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "מסכת רשת משנה:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index 556a5149167..128ca3ea63e 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index c52912ccc13..681ca31aa52 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index f43133b7ed8..4e127e80a79 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Se questo computer viene utilizzato in più di una rete indicare di seguito le configurazioni di rete alternative", -1, 9, 9, 220, 20 CONTROL "Indirizzo IP privato &automatico", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&Indirizzo IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index 542f0d826f8..df5a08d0e3a 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -32,8 +32,8 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 06815c66cdb..28d53a940d7 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 68d5cb42543..373e6007231 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hvis denne datamaskinen bruker mere en et nettverk, sett inn et alternativt IP adresse i innstilling under", -1, 9, 9, 220, 20 CONTROL "Au&tomatisk privat IP addresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP addresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet maske:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index f45e266524b..c169edebe92 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -34,8 +34,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Jeśli ten komputer jest używany w więcej niż jednej sieci, wprowadź poniżej alternatywne ustawienia protokołu IP", -1, 9, 9, 220, 20 CONTROL "Au&tomatyczny prywatny adres IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 210, 12 LTEXT "Adres &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "&Maska podsieci:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc index 52e1c1a8ade..f13e3315d02 100644 --- a/dll/win32/netcfgx/lang/pt-PT.rc +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -34,8 +34,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Se este computador for usado em mais de uma rede, insira as configurações de IP alternativas abaixo.", -1, 9, 9, 220, 20 CONTROL "IP privado &automático", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Endereço &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Máscara S&ubnet:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index fae8a5d2c3f..e5215219b27 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -34,8 +34,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dacă acest calculator este utilizat în mai multe rețele, puteți specifica mai jos o configurație alternativă.", -1, 9, 9, 220, 20 CONTROL "Adresă IP p&rivată obținută automat", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 90, 12 LTEXT "Adresă I&P:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Mască de su&brețea:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index 5d46291502c..f2797cd8b23 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Если этот компьютер используется в нескольких сетях, введите параметры альтернативной конфигурации протокола IP:", -1, 9, 9, 230, 20 CONTROL "А&втоматический частный IP-адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 130, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 130, 12 LTEXT "IP-&адрес:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Ма&ска подсети:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index 1115422238f..9b1156a7ed8 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index d72048b17c0..5b673ced9c4 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -34,8 +34,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Në qoftë se ky kompjuter është përdorur në më shumë se një rrjet, futni cilësimet alternative IP poshtë", -1, 9, 9, 220, 20 CONTROL "Adresë IP private auto%matike", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "Adresa &IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index 578e279a0bd..bdd89153f31 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index e218c502488..705d0fde2da 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -34,8 +34,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Eğer bu bilgisayar birden çok ağda kullanılıyorsa, aşağıya alternatif IP ayarlarını giriniz.", -1, 9, 9, 220, 20 CONTROL "&Otomatik özel IP adresi", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "K&ullanıcının yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "K&ullanıcının yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "&IP adresi:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "&Alt ağ maskesi:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index b72169e3bf4..ae19c910e9c 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -32,8 +32,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Якщо цей комп'ютер використовується в декількох мережах, введіть параметри альтернативної конфігурації IP", -1, 9, 9, 220, 20 CONTROL "А&втоматична приватна IP-адреса", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 120, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 120, 12 LTEXT "&IP-адреса:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "Ма&ска підмережі:", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index 9420b890c8f..dc8da9cb79c 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -41,8 +41,8 @@ FONT 9, "宋体" BEGIN LTEXT "如果此计算机使用多个网络，输入下面的备用 IP 设置", -1, 9, 9, 220, 20 CONTROL "自动专用 IP 地址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 地址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "子网掩码(&U)：", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc index d2e7ddaae9a..c58dc9741b9 100644 --- a/dll/win32/netcfgx/lang/zh-HK.rc +++ b/dll/win32/netcfgx/lang/zh-HK.rc @@ -40,8 +40,8 @@ FONT 9, "新細明體" BEGIN LTEXT "如果這台電腦是被用在多個網絡上，請在下列輸入其他 IP 設定", -1, 9, 9, 220, 20 CONTROL "自動專用 IP 位址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 位址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "子網絡遮罩(&U)：", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index b4cb6651580..d652a4272ba 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -40,8 +40,8 @@ FONT 9, "新細明體" BEGIN LTEXT "如果這台電腦是被用在多個網路上，在下列輸入其他 IP 設定", -1, 9, 9, 220, 20 CONTROL "自動專用 IP 位址(&T)", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 - GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + GROUPBOX "", -1, 9, 55, 228, 125, BS_GROUPBOX + CONTROL "使用者設定(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 55, 70, 12 LTEXT "IP 位址(&I)：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 LTEXT "子網路遮罩(&U)：", -1, 14, 95, 135, 8 diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c index 264a667805b..cc64370e856 100644 --- a/dll/win32/netcfgx/tcpipconf_notify.c +++ b/dll/win32/netcfgx/tcpipconf_notify.c @@ -15,7 +15,7 @@ typedef struct DWORD IPSize; DWORD TCPSize; DWORD UDPSize; -}TcpFilterSettings; +} TcpFilterSettings; // KEY: Tcpip\Parameter\{InstanceGuid}\IpAddress | DhcpIpAddress // KEY: Tcpip\Parameter\{InstanceGuid}\SubnetMask | DhcpSubnetMask @@ -30,7 +30,7 @@ typedef struct DWORD UseDomainNameDevolution; WCHAR szDomain[100]; LPWSTR szSearchList; -}TcpipAdvancedDNSDlgSettings; +} TcpipAdvancedDNSDlgSettings; typedef struct tagIP_ADDR { @@ -39,42 +39,42 @@ typedef struct tagIP_ADDR { DWORD Subnetmask; USHORT Metric; - }u; + } u; ULONG NTEContext; - struct tagIP_ADDR * Next; -}IP_ADDR; + struct tagIP_ADDR *Next; +} IP_ADDR; typedef enum { METRIC = 1, SUBMASK = 2, IPADDR = 3 -}COPY_TYPE; +} COPY_TYPE; typedef struct { - IP_ADDR * Ip; - IP_ADDR * Ns; - IP_ADDR * Gw; + IP_ADDR *Ip; + IP_ADDR *Ns; + IP_ADDR *Gw; UINT DhcpEnabled; UINT AutoconfigActive; DWORD Index; - TcpFilterSettings * pFilter; - TcpipAdvancedDNSDlgSettings * pDNS; -}TcpipSettings; + TcpFilterSettings *pFilter; + TcpipAdvancedDNSDlgSettings *pDNS; +} TcpipSettings; typedef struct { - const INetCfgComponentPropertyUi * lpVtbl; - const INetCfgComponentControl * lpVtblCompControl; - LONG ref; - IUnknown * pUnknown; - INetCfg * pNCfg; - INetCfgComponent * pNComp; + const INetCfgComponentPropertyUi *lpVtbl; + const INetCfgComponentControl *lpVtblCompControl; + LONG ref; + IUnknown *pUnknown; + INetCfg *pNCfg; + INetCfgComponent *pNComp; TcpipSettings *pCurrentConfig; CLSID NetCfgInstanceId; -}TcpipConfNotifyImpl, *LPTcpipConfNotifyImpl; +} TcpipConfNotifyImpl, *LPTcpipConfNotifyImpl; typedef struct { @@ -82,36 +82,36 @@ typedef struct HWND hDlgCtrl; WCHAR szIP[16]; UINT Metric; -}TcpipGwSettings; +} TcpipGwSettings; typedef struct { - BOOL bAdd; + BOOL bAdd; HWND hDlgCtrl; WCHAR szIP[16]; WCHAR szMask[16]; -}TcpipIpSettings; +} TcpipIpSettings; typedef struct { BOOL bAdd; HWND hDlgCtrl; WCHAR szIP[16]; -}TcpipDnsSettings; +} TcpipDnsSettings; typedef struct { BOOL bAdd; HWND hDlgCtrl; LPWSTR Suffix; -}TcpipSuffixSettings; +} TcpipSuffixSettings; typedef struct { HWND hDlgCtrl; UINT ResId; UINT MaxNum; -}TcpipPortSettings; +} TcpipPortSettings; static __inline LPTcpipConfNotifyImpl impl_from_INetCfgComponentControl(INetCfgComponentControl *iface) { @@ -2136,6 +2136,83 @@ LaunchAdvancedTcpipSettings( } } +HRESULT +InitializeTcpipAltDlgCtrls( + HWND hwndDlg, + TcpipSettings *pCurSettings) +{ + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223)); + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 0, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223)); + SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223)); + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223)); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + if (pCurSettings->DhcpEnabled) + { + CheckRadioButton(hwndDlg, IDC_USEDHCP, IDC_NODHCP, IDC_USEDHCP); + EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE); + } + else + { + CheckRadioButton(hwndDlg, IDC_USEDHCP, IDC_NODHCP, IDC_NODHCP); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); + + if (pCurSettings->Ip) + { + /* Set current ip address */ + SendDlgItemMessageA(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->IpAddress); + /* Set current hostmask */ + SendDlgItemMessageA(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->u.Subnetmask); + } + } + + if (pCurSettings->Gw && pCurSettings->Gw->IpAddress) + { + /* Set current gateway */ + SendDlgItemMessageA(hwndDlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Gw->IpAddress); + } + + if (pCurSettings->Ns) + { + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->IpAddress); + if (pCurSettings->Ns->Next) + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->Next->IpAddress); + else + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + } + else + { + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + } + + return S_OK; +} + INT_PTR CALLBACK TcpipAltConfDlg( @@ -2144,10 +2221,51 @@ TcpipAltConfDlg( WPARAM wParam, LPARAM lParam) { - switch(uMsg) + TcpipConfNotifyImpl *This; + LPPROPSHEETPAGE page; + BOOL bEnabled; + + switch (uMsg) { case WM_INITDIALOG: + { + page = (LPPROPSHEETPAGE)lParam; + This = (TcpipConfNotifyImpl*)page->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)This); + if (This->pCurrentConfig) + InitializeTcpipAltDlgCtrls(hwndDlg, This->pCurrentConfig); return TRUE; + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_USEDHCP: + case IDC_NODHCP: + { + if (HIWORD(wParam) == BN_CLICKED) + { + bEnabled = (IsDlgButtonChecked(hwndDlg, IDC_USEDHCP) == BST_CHECKED); + if (bEnabled) + { + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_DEFGATEWAY, IPM_CLEARADDRESS, 0, 0); + } + + EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), bEnabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUBNETMASK), bEnabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_DEFGATEWAY), bEnabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), bEnabled); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), bEnabled); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + } + break; + } } return FALSE; }

1 year, 1 month

[reactos] 02/02: [RAPPS] Validate DisplayIcon value and support icon index (#5664)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51a89791c1dbd30e2dee3… commit 51a89791c1dbd30e2dee34b17bf2a4d68cdb3a5e Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 20 17:41:31 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Nov 20 20:50:42 2023 +0300 [RAPPS] Validate DisplayIcon value and support icon index (#5664) - If the DisplayIcon value points to an invalid path, ExtractIconW() can return 1! ExtractIconExW() does not have this problem nor the -1 issue. Reference: https://devblogs.microsoft.com/oldnewthing/20050526-07/?p=35533 - Use the icon index from PathParseIconLocationW(). Addendum to c6c7fc1. CORE-19317 Test to reproduce: ``` @echo off reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v DisplayName /d "Ex1 Normal" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v DisplayIcon /d "%windir%\explorer.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v UninstallString /d "calc.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v DisplayName /d "Ex2 Bad icon path" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v DisplayIcon /d "%windir%\DoesNotExist.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v UninstallString /d "calc.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v DisplayName /d "Ex3 Resource index" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v DisplayIcon /d "%windir%\explorer.exe,4" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v UninstallString /d "calc.exe" /f start appwiz.cpl ``` --- base/applications/rapps/appview.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 004e1623c3c..a34e9cd9cad 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1289,14 +1289,13 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) /* Load icon from registry */ HICON hIcon = NULL; CStringW szIconPath; + int IconIndex; if (AppInfo->RetrieveIcon(szIconPath)) { - PathParseIconLocationW((LPWSTR)szIconPath.GetString()); + IconIndex = PathParseIconLocationW(szIconPath.GetBuffer()); + szIconPath.ReleaseBuffer(); - /* Load only the 1st icon from the application executable, - * because all apps provide the executables which have the main icon - * as 1st in the index , so we don't need other icons here */ - hIcon = ExtractIconW(hInst, szIconPath.GetString(), 0); + ExtractIconExW(szIconPath.GetString(), IconIndex, &hIcon, NULL, 1); } /* Use the default icon if none were found in the file, or if it is not supported (returned 1) */ @@ -1306,7 +1305,7 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } - int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); + IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo);

1 year, 1 month

[reactos] 01/02: [REACTOS] Revert commit 32bdd85b7fb (incorrectly formatted)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4add3fd482e4aa94d31fd… commit 4add3fd482e4aa94d31fde538f09cd047fdff247 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Nov 20 20:50:06 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Nov 20 20:50:06 2023 +0300 [REACTOS] Revert commit 32bdd85b7fb (incorrectly formatted) --- base/applications/rapps/appview.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index a34e9cd9cad..004e1623c3c 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1289,13 +1289,14 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) /* Load icon from registry */ HICON hIcon = NULL; CStringW szIconPath; - int IconIndex; if (AppInfo->RetrieveIcon(szIconPath)) { - IconIndex = PathParseIconLocationW(szIconPath.GetBuffer()); - szIconPath.ReleaseBuffer(); + PathParseIconLocationW((LPWSTR)szIconPath.GetString()); - ExtractIconExW(szIconPath.GetString(), IconIndex, &hIcon, NULL, 1); + /* Load only the 1st icon from the application executable, + * because all apps provide the executables which have the main icon + * as 1st in the index , so we don't need other icons here */ + hIcon = ExtractIconW(hInst, szIconPath.GetString(), 0); } /* Use the default icon if none were found in the file, or if it is not supported (returned 1) */ @@ -1305,7 +1306,7 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } - IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); + int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo);

1 year, 1 month

[reactos] 01/01: DisplayIcon needs to validate the result and support icon index (#5664)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32bdd85b7fb342c61fc86… commit 32bdd85b7fb342c61fc86efab54cb68bd0c59f03 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Nov 20 17:41:31 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 20 16:41:31 2023 +0000 DisplayIcon needs to validate the result and support icon index (#5664) Test: @echo off reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v DisplayName /d "Ex1 Normal" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v DisplayIcon /d "%windir%\explorer.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex1 /v UnstallString /d "calc.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v DisplayName /d "Ex2 Bad icon path" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v DisplayIcon /d "%windir%\DoesNotExist.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex2 /v UnstallString /d "calc.exe" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v DisplayName /d "Ex3 Resource index" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v DisplayIcon /d "%windir%\explorer.exe,4" /f reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ex3 /v UnstallString /d "calc.exe" /f start appwiz.cpl --- base/applications/rapps/appview.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 004e1623c3c..a34e9cd9cad 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1289,14 +1289,13 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) /* Load icon from registry */ HICON hIcon = NULL; CStringW szIconPath; + int IconIndex; if (AppInfo->RetrieveIcon(szIconPath)) { - PathParseIconLocationW((LPWSTR)szIconPath.GetString()); + IconIndex = PathParseIconLocationW(szIconPath.GetBuffer()); + szIconPath.ReleaseBuffer(); - /* Load only the 1st icon from the application executable, - * because all apps provide the executables which have the main icon - * as 1st in the index , so we don't need other icons here */ - hIcon = ExtractIconW(hInst, szIconPath.GetString(), 0); + ExtractIconExW(szIconPath.GetString(), IconIndex, &hIcon, NULL, 1); } /* Use the default icon if none were found in the file, or if it is not supported (returned 1) */ @@ -1306,7 +1305,7 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState) hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } - int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); + IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo);

1 year, 1 month

[reactos] 01/01: [WIDL] CMakeLists.txt: Remove an obsolete comment (#6016)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a0cd3743e01da6ac9506… commit 5a0cd3743e01da6ac95066f414058a1b8ce16160 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Nov 20 16:07:46 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 20 16:07:46 2023 +0100 [WIDL] CMakeLists.txt: Remove an obsolete comment (#6016) Addendum to 8184186 (r55855). --- sdk/tools/widl/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 4fbfb48749b..0a4533f03b0 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -35,7 +35,6 @@ list(APPEND SOURCE ../port/getopt1.c ../port/mkstemps.c) -# Taken from widl.rbuild add_definitions(-DINT16=SHORT) add_host_tool(widl ${SOURCE}) target_link_libraries(widl PRIVATE host_includes wpphost)

1 year, 1 month

[reactos] 01/01: [NETSHELL] Double click on component should open properties (#6008)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc60aa07a024f77f543f… commit cbc60aa07a024f77f543f813b0c648688050c3a6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 20 21:48:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 20 21:48:18 2023 +0900 [NETSHELL] Double click on component should open properties (#6008) Based on KRosUser's lanprop.patch. Add NM_DBLCLK handling. CORE-19330 --- dll/shellext/netshell/lanconnectui.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/shellext/netshell/lanconnectui.cpp b/dll/shellext/netshell/lanconnectui.cpp index 70b72549171..8213eb284a5 100644 --- a/dll/shellext/netshell/lanconnectui.cpp +++ b/dll/shellext/netshell/lanconnectui.cpp @@ -341,6 +341,13 @@ CNetConnectionPropertyUi::LANPropertiesUIDlg( return PSNRET_NOERROR; } #endif + if (lppl->hdr.code == NM_DBLCLK) + { + This = (CNetConnectionPropertyUi*)GetWindowLongPtr(hwndDlg, DWLP_USER); + This->ShowNetworkComponentProperties(hwndDlg); + return FALSE; + } + if (lppl->hdr.code == LVN_ITEMCHANGING) { ZeroMemory(&li, sizeof(li));

1 year, 1 month

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