Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [RTL] Implement RtlGetProcessHeaps

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8cdd1a8799acc381eba6… commit b8cdd1a8799acc381eba6db6889e94a141185e89 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Dec 7 20:20:03 2023 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Dec 17 22:28:24 2023 +0100 [RTL] Implement RtlGetProcessHeaps --- sdk/lib/rtl/heap.c | 17 ++--------------- sdk/lib/rtl/heap.h | 1 + sdk/lib/rtl/heapuser.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 847051df44c..781c2276c49 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -3756,7 +3756,7 @@ BOOLEAN NTAPI RtlValidateHeap( } /* - * @implemented + * @unimplemented */ NTSTATUS NTAPI RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, @@ -3766,21 +3766,8 @@ RtlEnumProcessHeaps(PHEAP_ENUMERATION_ROUTINE HeapEnumerationRoutine, return STATUS_NOT_IMPLEMENTED; } - /* - * @implemented - */ -ULONG NTAPI -RtlGetProcessHeaps(ULONG count, - HANDLE *heaps) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @implemented + * @unimplemented */ BOOLEAN NTAPI RtlValidateProcessHeaps(VOID) diff --git a/sdk/lib/rtl/heap.h b/sdk/lib/rtl/heap.h index 5eaefde8b2f..1f0b5436011 100644 --- a/sdk/lib/rtl/heap.h +++ b/sdk/lib/rtl/heap.h @@ -339,6 +339,7 @@ BOOLEAN NTAPI RtlpValidateHeapHeaders(PHEAP Heap, BOOLEAN Recalculate); /* heapdbg.c */ +NTSYSAPI HANDLE NTAPI RtlDebugCreateHeap(ULONG Flags, PVOID Addr, diff --git a/sdk/lib/rtl/heapuser.c b/sdk/lib/rtl/heapuser.c index 0d8cdab5336..c3d3a61a06d 100644 --- a/sdk/lib/rtl/heapuser.c +++ b/sdk/lib/rtl/heapuser.c @@ -127,3 +127,32 @@ RtlInitializeHeapManager(VOID) RtlInitializeCriticalSection(&RtlpProcessHeapsListLock); } +ULONG NTAPI +RtlGetProcessHeaps(_In_ ULONG HeapCount, _Out_cap_(HeapCount) HANDLE *HeapArray) +{ + PPEB Peb = RtlGetCurrentPeb(); + + RtlEnterCriticalSection(&RtlpProcessHeapsListLock); + ULONG nHeaps = Peb->NumberOfHeaps; + + _SEH2_TRY + { + if (HeapArray) + { + for (ULONG n = 0; n < min(nHeaps, HeapCount); ++n) + { + HeapArray[n] = Peb->ProcessHeaps[n]; + } + } + } + _SEH2_FINALLY + { + RtlLeaveCriticalSection(&RtlpProcessHeapsListLock); + } + _SEH2_END; + + /* TODO: Add RtlpDphPageHeapList here */ + + return nHeaps; +} +

1 year, 9 months

[reactos] 01/01: [SHELL32] AddStaticContextMenusToMenu(): Fix 3 MSVC 'warning C4805' (#6177)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ba94c83b5bbc0edb3235… commit 0ba94c83b5bbc0edb3235e7c950a9aa251ba8a73 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:20:06 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:20:06 2023 +0100 [SHELL32] AddStaticContextMenusToMenu(): Fix 3 MSVC 'warning C4805' (#6177) - Use 'bool' type. - Do not abuse '|=' operator. Addendum to commit 7fb91d98f --- dll/win32/shell32/CDefaultContextMenu.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index af57d92d3bb..72913f36918 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -540,7 +540,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( } UINT cmdFlags = 0; - BOOL hide = FALSE; + bool hide = false; HKEY hkVerb; if (idResource > 0) { @@ -585,12 +585,13 @@ CDefaultContextMenu::AddStaticContextMenusToMenu( // FIXME: GetAsyncKeyState should not be called here, clients // need to be updated to set the CMF_EXTENDEDVERBS flag. if (!(uFlags & CMF_EXTENDEDVERBS) && GetAsyncKeyState(VK_SHIFT) >= 0) - hide |= RegValueExists(hkVerb, L"Extended"); + hide = RegValueExists(hkVerb, L"Extended"); - hide |= RegValueExists(hkVerb, L"ProgrammaticAccessOnly"); + if (!hide) + hide = RegValueExists(hkVerb, L"ProgrammaticAccessOnly"); - if (!(uFlags & CMF_DISABLEDVERBS)) - hide |= RegValueExists(hkVerb, L"LegacyDisable"); + if (!hide && !(uFlags & CMF_DISABLEDVERBS)) + hide = RegValueExists(hkVerb, L"LegacyDisable"); if (RegValueExists(hkVerb, L"NeverDefault")) fState &= ~MFS_DEFAULT;

1 year, 9 months

[reactos] 01/01: [APISETS] Forward _seh_longjmp_unwind4() to msvcrt (#6176)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1c68dcba09ecf6d7bf68… commit e1c68dcba09ecf6d7bf687e8a604f8f036abf83a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:19:00 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:19:00 2023 +0100 [APISETS] Forward _seh_longjmp_unwind4() to msvcrt (#6176) Addendum to commit 1a6b6a27b --- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index e7fe8972ece..89049ebd743 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -1173,7 +1173,7 @@ @ stub _o_wmemmove_s @ stdcall _purecall() msvcrt._purecall @ stdcall -arch=i386 _seh_longjmp_unwind() msvcrt._seh_longjmp_unwind -@ stub _seh_longjmp_unwind4 +@ stdcall -version=0x600+ -arch=i386 _seh_longjmp_unwind4() msvcrt._seh_longjmp_unwind4 @ stub _set_purecall_handler @ stub _set_se_translator @ stdcall -arch=i386 _setjmp3() msvcrt._setjmp3

1 year, 9 months

[reactos] 01/01: [REGEDIT] Fix inverted case matching when searching value data (#6159)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1f9ea10aa5b651d4b875… commit c1f9ea10aa5b651d4b875625e50a77853094bf80 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 22:16:34 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:16:34 2023 +0100 [REGEDIT] Fix inverted case matching when searching value data (#6159) --- base/applications/regedit/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index 9405271a916..919ae0cbe78 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -91,7 +91,7 @@ static BOOL CompareName(LPCWSTR pszName1, LPCWSTR pszName2) static BOOL MatchString(LPCWCH pch1, INT cch1, LPCWCH pch2, INT cch2) { INT i; - DWORD dwNorm = ((s_dwFlags & RSF_MATCHCASE) ? NORM_IGNORECASE : 0); + DWORD dwNorm = ((s_dwFlags & RSF_MATCHCASE) ? 0 : NORM_IGNORECASE); if (s_dwFlags & RSF_WHOLESTRING) return 2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, dwNorm, pch1, cch1, pch2, cch2);

1 year, 9 months

[reactos] 01/01: [BROWSEUI] Don't call SHOpenFolderAndSelectItems with full pidls and don't leak them (#6153)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5be53f553c7f032701a88… commit 5be53f553c7f032701a8817941af14ebeddf8fc8 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 22:16:19 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:16:19 2023 +0100 [BROWSEUI] Don't call SHOpenFolderAndSelectItems with full pidls and don't leak them (#6153) - The children passed to SHOpenFolderAndSelectItems are not supposed to be full pidls. - Don't leak the array from IShellFolderView::GetSelectedObjects. --- dll/win32/browseui/shellfind/CFindFolder.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 6108970fb55..999e57658eb 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -809,11 +809,10 @@ class CFindFolderContextMenu : CComHeapPtr<ITEMIDLIST> folderPidl(ILCreateFromPathW(_ILGetPath(apidl[i]))); if (!folderPidl) return E_OUTOFMEMORY; - CComHeapPtr<ITEMIDLIST> filePidl(ILCombine(folderPidl, _ILGetFSPidl(apidl[i]))); - if (!filePidl) - return E_OUTOFMEMORY; - SHOpenFolderAndSelectItems(folderPidl, 1, &filePidl, 0); + LPCITEMIDLIST child = _ILGetFSPidl(apidl[i]); + SHOpenFolderAndSelectItems(folderPidl, 1, &child, 0); } + LocalFree(apidl); // Yes, LocalFree return S_OK; }

1 year, 9 months

[reactos] 01/01: [CSCRIPT][WSCRIPT] Implement Sleep (#6146)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ffc31554d2134fb552a0… commit 7ffc31554d2134fb552a06a0c363b5dc903ff7d5 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 22:14:45 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:14:45 2023 +0100 [CSCRIPT][WSCRIPT] Implement Sleep (#6146) --- base/applications/cmdutils/wscript/host.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/base/applications/cmdutils/wscript/host.c b/base/applications/cmdutils/wscript/host.c index a61851e22bc..b44064028eb 100644 --- a/base/applications/cmdutils/wscript/host.c +++ b/base/applications/cmdutils/wscript/host.c @@ -407,8 +407,16 @@ static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object) static HRESULT WINAPI Host_Sleep(IHost *iface, LONG Time) { +#ifdef __REACTOS__ + UNREFERENCED_PARAMETER(iface); + if (Time < 0) + return E_INVALIDARG; + Sleep(Time); + return S_OK; +#else WINE_FIXME("(%d)\n", Time); return E_NOTIMPL; +#endif } static HRESULT WINAPI Host_ConnectObject(IHost *iface, IDispatch *Object, BSTR Prefix)

1 year, 9 months

[reactos] 01/01: [WIN32SS:GDI] eng/error.c: Minor code tweaks (#6128)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf7e7c2383b8ef43c1752… commit bf7e7c2383b8ef43c1752df4e0d40ccfc19aa36e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:13:45 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:13:45 2023 +0100 [WIN32SS:GDI] eng/error.c: Minor code tweaks (#6128) - Remove a useless debug.h include. - Use the initialized pTeb pointer. - Remove a useless else. - Add a SAL2 annotation. --- win32ss/gdi/eng/error.c | 10 ++-------- win32ss/gdi/ntgdi/misc.h | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/eng/error.c b/win32ss/gdi/eng/error.c index 380869bfd6e..b276d3aad25 100644 --- a/win32ss/gdi/eng/error.c +++ b/win32ss/gdi/eng/error.c @@ -1,8 +1,5 @@ #include <win32k.h> -#define NDEBUG -#include <debug.h> - /* * @implemented * http://msdn.microsoft.com/en-us/library/ff564940%28VS.85%29.aspx @@ -12,10 +9,7 @@ APIENTRY EngGetLastError(VOID) { PTEB pTeb = NtCurrentTeb(); - if (pTeb) - return NtCurrentTeb()->LastErrorValue; - else - return ERROR_SUCCESS; + return (pTeb ? pTeb->LastErrorValue : ERROR_SUCCESS); } /* @@ -34,7 +28,7 @@ EngSetLastError(_In_ ULONG iError) VOID FASTCALL -SetLastNtError(NTSTATUS Status) +SetLastNtError(_In_ NTSTATUS Status) { EngSetLastError(RtlNtStatusToDosError(Status)); } diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 06fa17b8255..6b0e2f022b0 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -60,9 +60,9 @@ DWORD NTAPI RegGetSectionDWORD(LPCWSTR pszSection, LPWSTR pszValue, DWORD dwDefault); -VOID FASTCALL -SetLastNtError( - NTSTATUS Status); +VOID +FASTCALL +SetLastNtError(_In_ NTSTATUS Status); typedef struct _GDI_POOL *PGDI_POOL;

1 year, 9 months

[reactos] 01/01: [SDK:CMAKE] writing_CmakeLists_for_ReactOS.txt: Fix typos (#6105)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91d291f7662d9e4e5463f… commit 91d291f7662d9e4e5463f8b0e998645737edaff4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Dec 17 22:12:25 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:12:25 2023 +0100 [SDK:CMAKE] writing_CmakeLists_for_ReactOS.txt: Fix typos (#6105) --- sdk/cmake/writing_CmakeLists_for_ReactOS.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/cmake/writing_CmakeLists_for_ReactOS.txt b/sdk/cmake/writing_CmakeLists_for_ReactOS.txt index b13cbe91d43..c621b09006d 100644 --- a/sdk/cmake/writing_CmakeLists_for_ReactOS.txt +++ b/sdk/cmake/writing_CmakeLists_for_ReactOS.txt @@ -8,14 +8,14 @@ Optional arguments are marked with [brackets], input is marked with <comparison --------------------------------------------------------------------------------------------------------------------------------------------- set_module_type(<target> <type> [UNICODE] [BASEADDRESS <baseaddress>] [ENTRYPOINT <entrypoint> <stacksize>]) -This set the type of the module, and take cares of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to reactos build. +This sets the type of the module, and takes care of setting common linker options or definitions to the specified target, module file extension, etc. Please always use this when adding a module to ReactOS build. ARGUMENTS: <target>: name of the target. The module must have been added with add_executable or add_library before calling this function. -<type>: one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver -UNICODE: provide this if the module was written for unicode API -<baseaddress>: provide this if you want your module to have a different base address than the defualt one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. -<entrypoint>: name of the function which will be the entr point of the module. If it's not provided, it's guessed from the module type. +<type>: one of win32gui, win32cui, win32dll, win32ocx, cpl, nativecui, nativedll, kernelmodedriver. +UNICODE: provide this if the module was written for unicode API. +<baseaddress>: provide this if you want your module to have a different base address than the default one (according to <type>). For win32dll modules, please use baseaddress.cmake instead. +<entrypoint>: name of the function which will be the entry point of the module. If it's not provided, it's guessed from the module type. <stacksize>: Size of stack required for the parameters of <entrypoint>. TYPICAL USE:

1 year, 9 months

[reactos] 01/01: [USER32] Support loading icons from data file module (#6065)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82c07abf1ab070208d3b8… commit 82c07abf1ab070208d3b83bb0f628caef41275da Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Dec 17 22:11:50 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 17 22:11:50 2023 +0100 [USER32] Support loading icons from data file module (#6065) GetModuleFileName() fails on LOAD_LIBRARY_AS_DATAFILE causing LoadImage to fail. Use a fake filename for LR_SHARED (with same format as Windows). This may not be a good design, but it does match Windows' behaviour. + Added test. --- modules/rostests/apitests/user32/LoadImage.c | 47 ++++++++++++++++++++++++++++ win32ss/user/user32/windows/cursoricon.c | 16 +++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/user32/LoadImage.c b/modules/rostests/apitests/user32/LoadImage.c index 64af37325d2..f46e4be7846 100644 --- a/modules/rostests/apitests/user32/LoadImage.c +++ b/modules/rostests/apitests/user32/LoadImage.c @@ -1,6 +1,50 @@ #include "precomp.h" +static void test_LoadImage_DataFile(void) +{ + static const struct + { + int result; + LPCWSTR file; + int res_id; + UINT lr; + BOOL same_handle; + BOOL after_unload; /* LR_SHARED stays valid */ + } + tests[] = + { + { 1, L"shell32.dll", 2, 0, 0, 0 }, + { 1, L"shell32.dll", 2, LR_SHARED, 1, 1 }, + { 0, L"shell32.dll", 0xfff0, 0, 1, 0 }, /* Icon should not exist */ + { 1, L"regedit.exe", 100, 0, 0, 0 }, + { 1, L"regedit.exe", 100, LR_SHARED, 1, 1 } + }; + + SIZE_T i; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + HANDLE handle1, handle2; + HMODULE hMod = LoadLibraryExW(tests[i].file, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!((SIZE_T)hMod & 3)) + { + skip("Could not load library as datafile %ls\n", tests[i].file); + continue; + } + + handle1 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!handle1 == !!tests[i].result, "Failed to load %ls,-%d from %p\n", tests[i].file, tests[i].res_id, hMod); + + handle2 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!(handle1 == handle2) == !!tests[i].same_handle, "Shared handles don't match\n"); + + FreeLibrary(hMod); + + handle1 = LoadImage(hMod, MAKEINTRESOURCE(tests[i].res_id), IMAGE_ICON, 0, 0, tests[i].lr); + ok(!!handle1 == !!tests[i].after_unload, "LR_%x handle should %sload after FreeLibrary\n", tests[i].lr, tests[i].after_unload ? "" : "not "); + } +} + START_TEST(LoadImage) { char path[MAX_PATH]; @@ -77,6 +121,9 @@ START_TEST(LoadImage) DeleteObject(ii.hbmMask); if(ii.hbmColor) DeleteObject(ii.hbmColor); + /* LOAD_LIBRARY_AS_DATAFILE */ + test_LoadImage_DataFile(); + return; } diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index 1f6b71714aa..a3f8a48602e 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -1454,7 +1454,21 @@ CURSORICON_LoadImageW( RtlInitUnicodeString(&ustrRsrc, lpszName); } - if(hinst) + if(LDR_IS_RESOURCE(hinst)) + { + /* We don't have a real module for GetModuleFileName, construct a fake name instead. + * GetIconInfoEx reveals the name used by Windows. */ + LPCWSTR fakeNameFmt = sizeof(void*) > 4 ? L"\x01%016IX" : L"\x01%08IX"; + ustrModule.MaximumLength = 18 * sizeof(WCHAR); + ustrModule.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrModule.MaximumLength); + if (!ustrModule.Buffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + ustrModule.Length = wsprintfW(ustrModule.Buffer, fakeNameFmt, hinst) * sizeof(WCHAR); + } + else if(hinst) { DWORD size = MAX_PATH; /* Get the module name string */

1 year, 9 months

[reactos] 01/01: [NETCFGX] Create only one "Alternative Configuration" tab

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f349ab3c28a6e13c671b… commit 8f349ab3c28a6e13c671b0393fee4784d1ef218e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 17 21:50:20 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 17 21:50:20 2023 +0100 [NETCFGX] Create only one "Alternative Configuration" tab - Check for the presence of the second tab. - Remove unnecessary checks for checked radiobuttons. CORE-19328 --- dll/win32/netcfgx/tcpipconf_notify.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dll/win32/netcfgx/tcpipconf_notify.c b/dll/win32/netcfgx/tcpipconf_notify.c index e6db3ae9a1d..d662f7fdf33 100644 --- a/dll/win32/netcfgx/tcpipconf_notify.c +++ b/dll/win32/netcfgx/tcpipconf_notify.c @@ -2648,7 +2648,7 @@ TcpipBasicDlg( switch (LOWORD(wParam)) { case IDC_USEDHCP: - if (IsDlgButtonChecked(hwndDlg, IDC_USEDHCP) == BST_CHECKED) + if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) == 0) { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_CLEARADDRESS, 0, 0); @@ -2662,7 +2662,7 @@ TcpipBasicDlg( } break; case IDC_NODHCP: - if (IsDlgButtonChecked(hwndDlg, IDC_NODHCP) == BST_CHECKED) + if (SendMessageW(GetParent(hwndDlg), PSM_INDEXTOID, 1, 0) != 0) { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_IPADDR), TRUE); @@ -2680,22 +2680,16 @@ TcpipBasicDlg( } break; case IDC_AUTODNS: - if (IsDlgButtonChecked(hwndDlg, IDC_AUTODNS) == BST_CHECKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); - SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE); - } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); + SendDlgItemMessageW(hwndDlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), FALSE); break; case IDC_FIXEDDNS: - if (IsDlgButtonChecked(hwndDlg, IDC_FIXEDDNS) == BST_CHECKED) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); - } + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); break; case IDC_ADVANCED: LaunchAdvancedTcpipSettings(hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER));

1 year, 9 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