Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 01/01: [SHELL32_APITEST] Add FindExecutable testcase (#3723)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fccea84dd4d4fd5fdee15… commit fccea84dd4d4fd5fdee15f083365fd51aa68dd34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 6 06:51:42 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 6 06:51:42 2021 +0900 [SHELL32_APITEST] Add FindExecutable testcase (#3723) Investigate the implementation of shell32!FindExecutable function. CORE-17351, CORE-16898, CORE-17612 --- modules/rostests/apitests/shell32/CMakeLists.txt | 13 +- .../rostests/apitests/shell32/FindExecutable.cpp | 232 +++++++++++++++++++++ .../rostests/apitests/shell32/SHChangeNotify.cpp | 8 +- .../{shell-notify.cpp => shell32_apitest_sub.cpp} | 3 + modules/rostests/apitests/shell32/testlist.c | 2 + 5 files changed, 248 insertions(+), 10 deletions(-) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 81b40767113..990e1463d48 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND SOURCE Control_RunDLLW.cpp DragDrop.cpp ExtractIconEx.cpp + FindExecutable.cpp IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathResolve.cpp @@ -45,9 +46,9 @@ add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlw add_pch(shell32_apitest shelltest.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET shell32_apitest) -# shell-notify.exe -add_executable(shell-notify shell-notify.cpp) -target_link_libraries(shell-notify cpprt atl_classes) -set_module_type(shell-notify win32gui UNICODE) -add_importlibs(shell-notify msvcrt kernel32 user32 shell32 shlwapi ole32) -add_rostests_file(TARGET shell-notify SUBDIR testdata) +# shell32_apitest_sub.exe +add_executable(shell32_apitest_sub shell32_apitest_sub.cpp) +target_link_libraries(shell32_apitest_sub cpprt atl_classes) +set_module_type(shell32_apitest_sub win32gui UNICODE) +add_importlibs(shell32_apitest_sub msvcrt kernel32 user32 shell32 shlwapi ole32) +add_rostests_file(TARGET shell32_apitest_sub SUBDIR testdata) diff --git a/modules/rostests/apitests/shell32/FindExecutable.cpp b/modules/rostests/apitests/shell32/FindExecutable.cpp new file mode 100644 index 00000000000..2e18974dac4 --- /dev/null +++ b/modules/rostests/apitests/shell32/FindExecutable.cpp @@ -0,0 +1,232 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for FindExecutable + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "shelltest.h" +#include <stdio.h> +#include <shlwapi.h> + +static char s_sub_program[MAX_PATH]; + +static BOOL +GetSubProgramPath(void) +{ + GetModuleFileNameA(NULL, s_sub_program, _countof(s_sub_program)); + PathRemoveFileSpecA(s_sub_program); + PathAppendA(s_sub_program, "shell32_apitest_sub.exe"); + + if (!PathFileExistsA(s_sub_program)) + { + PathRemoveFileSpecA(s_sub_program); + PathAppendA(s_sub_program, "testdata\\shell32_apitest_sub.exe"); + + if (!PathFileExistsA(s_sub_program)) + { + return FALSE; + } + } + + return TRUE; +} + +typedef struct TEST_ENTRY +{ + INT lineno; + BOOL ret; + LPCSTR file; + LPCSTR dir; + LPCSTR result; +} TEST_ENTRY; + +static char s_win_dir[MAX_PATH]; +static char s_win_notepad[MAX_PATH]; +static char s_sys_notepad[MAX_PATH]; +static char s_win_test_exe[MAX_PATH]; +static char s_sys_test_exe[MAX_PATH]; +static char s_win_bat_file[MAX_PATH]; +static char s_sys_bat_file[MAX_PATH]; + +#define DIR_0 NULL +#define DIR_1 "." +#define DIR_2 ".." +#define DIR_3 s_win_dir +#define DIR_4 "(invalid)" + +static const TEST_ENTRY s_entries[] = +{ + { __LINE__, TRUE, "notepad", DIR_0, s_sys_notepad }, + { __LINE__, TRUE, "notepad", DIR_1, s_sys_notepad }, + { __LINE__, TRUE, "notepad", DIR_2, s_sys_notepad }, + { __LINE__, TRUE, "notepad", DIR_3, s_win_notepad }, + { __LINE__, TRUE, "notepad", DIR_4, s_sys_notepad }, + { __LINE__, FALSE, " notepad", DIR_0, "" }, + { __LINE__, FALSE, " notepad", DIR_1, "" }, + { __LINE__, FALSE, " notepad", DIR_2, "" }, + { __LINE__, FALSE, " notepad", DIR_3, "" }, + { __LINE__, FALSE, " notepad", DIR_4, "" }, + { __LINE__, FALSE, "notepad ", DIR_0, "" }, + { __LINE__, FALSE, "notepad ", DIR_1, "" }, + { __LINE__, FALSE, "notepad ", DIR_2, "" }, + { __LINE__, FALSE, "notepad ", DIR_3, "" }, + { __LINE__, FALSE, "notepad ", DIR_4, "" }, + { __LINE__, TRUE, "\"notepad\"", DIR_0, s_sys_notepad }, + { __LINE__, TRUE, "\"notepad\"", DIR_1, s_sys_notepad }, + { __LINE__, TRUE, "\"notepad\"", DIR_2, s_sys_notepad }, + { __LINE__, TRUE, "\"notepad\"", DIR_3, s_win_notepad }, + { __LINE__, TRUE, "\"notepad\"", DIR_4, s_sys_notepad }, + { __LINE__, TRUE, "notepad.exe", DIR_0, s_sys_notepad }, + { __LINE__, TRUE, "notepad.exe", DIR_1, s_sys_notepad }, + { __LINE__, TRUE, "notepad.exe", DIR_2, s_sys_notepad }, + { __LINE__, TRUE, "notepad.exe", DIR_3, s_win_notepad }, + { __LINE__, TRUE, "notepad.exe", DIR_4, s_sys_notepad }, + { __LINE__, FALSE, "notepad.bat", DIR_0, "" }, + { __LINE__, FALSE, "notepad.bat", DIR_1, "" }, + { __LINE__, FALSE, "notepad.bat", DIR_2, "" }, + { __LINE__, FALSE, "notepad.bat", DIR_3, "" }, + { __LINE__, FALSE, "notepad.bat", DIR_4, "" }, + { __LINE__, FALSE, "C:\\notepad.exe", DIR_0, "" }, + { __LINE__, FALSE, "C:\\notepad.exe", DIR_1, "" }, + { __LINE__, FALSE, "C:\\notepad.exe", DIR_2, "" }, + { __LINE__, FALSE, "C:\\notepad.exe", DIR_3, "" }, + { __LINE__, FALSE, "C:\\notepad.exe", DIR_4, "" }, + { __LINE__, FALSE, "..\\notepad.exe", DIR_0, "" }, + { __LINE__, FALSE, "..\\notepad.exe", DIR_1, "" }, + { __LINE__, FALSE, "..\\notepad.exe", DIR_2, "" }, + { __LINE__, FALSE, "..\\notepad.exe", DIR_3, "" }, + { __LINE__, FALSE, "..\\notepad.exe", DIR_4, "" }, + { __LINE__, TRUE, "test program", DIR_0, s_sys_test_exe }, + { __LINE__, TRUE, "test program", DIR_1, s_sys_test_exe }, + { __LINE__, TRUE, "test program", DIR_2, s_sys_test_exe }, + { __LINE__, TRUE, "test program", DIR_3, s_win_test_exe }, + { __LINE__, TRUE, "test program", DIR_4, s_sys_test_exe }, + { __LINE__, FALSE, " test program", DIR_0, "" }, + { __LINE__, FALSE, " test program", DIR_1, "" }, + { __LINE__, FALSE, " test program", DIR_2, "" }, + { __LINE__, FALSE, " test program", DIR_3, "" }, + { __LINE__, FALSE, " test program", DIR_4, "" }, + { __LINE__, FALSE, "test program ", DIR_0, "" }, + { __LINE__, FALSE, "test program ", DIR_1, "" }, + { __LINE__, FALSE, "test program ", DIR_2, "" }, + { __LINE__, FALSE, "test program ", DIR_3, "" }, + { __LINE__, FALSE, "test program ", DIR_4, "" }, + { __LINE__, TRUE, "\"test program\"", DIR_0, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program\"", DIR_1, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program\"", DIR_2, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program\"", DIR_3, s_win_test_exe }, + { __LINE__, TRUE, "\"test program\"", DIR_4, s_sys_test_exe }, + { __LINE__, TRUE, "test program.exe", DIR_0, s_sys_test_exe }, + { __LINE__, TRUE, "test program.exe", DIR_1, s_sys_test_exe }, + { __LINE__, TRUE, "test program.exe", DIR_2, s_sys_test_exe }, + { __LINE__, TRUE, "test program.exe", DIR_3, s_win_test_exe }, + { __LINE__, TRUE, "test program.exe", DIR_4, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program.exe\"", DIR_0, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program.exe\"", DIR_1, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program.exe\"", DIR_2, s_sys_test_exe }, + { __LINE__, TRUE, "\"test program.exe\"", DIR_3, s_win_test_exe }, + { __LINE__, TRUE, "\"test program.exe\"", DIR_4, s_sys_test_exe }, + { __LINE__, FALSE, "\"test program.exe \"", DIR_0, "" }, + { __LINE__, FALSE, "\"test program.exe \"", DIR_1, "" }, + { __LINE__, FALSE, "\"test program.exe \"", DIR_2, "" }, + { __LINE__, FALSE, "\"test program.exe \"", DIR_3, "" }, + { __LINE__, FALSE, "\"test program.exe \"", DIR_4, "" }, + { __LINE__, FALSE, "\" test program.exe\"", DIR_0, "" }, + { __LINE__, FALSE, "\" test program.exe\"", DIR_1, "" }, + { __LINE__, FALSE, "\" test program.exe\"", DIR_2, "" }, + { __LINE__, FALSE, "\" test program.exe\"", DIR_3, "" }, + { __LINE__, FALSE, "\" test program.exe\"", DIR_4, "" }, + { __LINE__, TRUE, "test program.bat", DIR_0, s_sys_bat_file }, + { __LINE__, TRUE, "test program.bat", DIR_1, s_sys_bat_file }, + { __LINE__, TRUE, "test program.bat", DIR_2, s_sys_bat_file }, + { __LINE__, TRUE, "test program.bat", DIR_3, s_win_bat_file }, + { __LINE__, TRUE, "test program.bat", DIR_4, s_sys_bat_file }, + { __LINE__, FALSE, " test program.bat ", DIR_0, "" }, + { __LINE__, FALSE, " test program.bat ", DIR_1, "" }, + { __LINE__, FALSE, " test program.bat ", DIR_2, "" }, + { __LINE__, FALSE, " test program.bat ", DIR_3, "" }, + { __LINE__, FALSE, " test program.bat ", DIR_4, "" }, + { __LINE__, TRUE, "\"test program.bat\"", DIR_0, s_sys_bat_file }, + { __LINE__, TRUE, "\"test program.bat\"", DIR_1, s_sys_bat_file }, + { __LINE__, TRUE, "\"test program.bat\"", DIR_2, s_sys_bat_file }, + { __LINE__, TRUE, "\"test program.bat\"", DIR_3, s_win_bat_file }, + { __LINE__, TRUE, "\"test program.bat\"", DIR_4, s_sys_bat_file }, + { __LINE__, TRUE, "shell32_apitest_sub.exe", DIR_0, s_sub_program }, + { __LINE__, TRUE, "shell32_apitest_sub.exe", DIR_1, "shell32_apitest_sub.exe" }, + { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_2, "" }, + { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_3, "" }, + { __LINE__, FALSE, "shell32_apitest_sub.exe", DIR_4, "" }, +}; + +static void DoTestEntry(const TEST_ENTRY *pEntry) +{ + char result[MAX_PATH]; + result[0] = 0; + BOOL ret = ((INT_PTR)FindExecutableA(pEntry->file, pEntry->dir, result) > 32); + ok(ret == pEntry->ret, "Line %u: ret expected %d, got %d\n", pEntry->lineno, pEntry->ret, ret); + + GetLongPathNameA(result, result, _countof(result)); + + ok(lstrcmpiA(result, pEntry->result) == 0, + "Line %u: result expected '%s', got '%s'\n", + pEntry->lineno, pEntry->result, result); +} + +START_TEST(FindExecutable) +{ + if (!GetSubProgramPath()) + { + skip("shell32_apitest_sub.exe not found\n"); + return; + } + + char cur_dir[MAX_PATH]; + GetCurrentDirectoryA(_countof(cur_dir), cur_dir); + if (PathIsRootA(cur_dir)) + { + skip("Don't use this program at root directory\n"); + return; + } + + GetWindowsDirectoryA(s_win_dir, _countof(s_win_dir)); + + GetWindowsDirectoryA(s_win_notepad, _countof(s_win_notepad)); + PathAppendA(s_win_notepad, "notepad.exe"); + + GetSystemDirectoryA(s_sys_notepad, _countof(s_sys_notepad)); + PathAppendA(s_sys_notepad, "notepad.exe"); + + GetWindowsDirectoryA(s_win_test_exe, _countof(s_win_test_exe)); + PathAppendA(s_win_test_exe, "test program.exe"); + BOOL ret = CopyFileA(s_sub_program, s_win_test_exe, FALSE); + if (!ret) + { + skip("Please retry with admin rights\n"); + return; + } + + GetSystemDirectoryA(s_sys_test_exe, _countof(s_sys_test_exe)); + PathAppendA(s_sys_test_exe, "test program.exe"); + ok_int(CopyFileA(s_sub_program, s_sys_test_exe, FALSE), TRUE); + + GetWindowsDirectoryA(s_win_bat_file, _countof(s_win_bat_file)); + PathAppendA(s_win_bat_file, "test program.bat"); + fclose(fopen(s_win_bat_file, "wb")); + ok_int(PathFileExistsA(s_win_bat_file), TRUE); + + GetSystemDirectoryA(s_sys_bat_file, _countof(s_sys_bat_file)); + PathAppendA(s_sys_bat_file, "test program.bat"); + fclose(fopen(s_sys_bat_file, "wb")); + ok_int(PathFileExistsA(s_sys_bat_file), TRUE); + + for (UINT iTest = 0; iTest < _countof(s_entries); ++iTest) + { + DoTestEntry(&s_entries[iTest]); + } + + DeleteFileA(s_win_test_exe); + DeleteFileA(s_sys_test_exe); + DeleteFileA(s_win_bat_file); + DeleteFileA(s_sys_bat_file); +} diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index cd5b45c646c..377b9ce1cec 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -322,12 +322,12 @@ GetSubProgramPath(void) { GetModuleFileNameW(NULL, s_szSubProgram, _countof(s_szSubProgram)); PathRemoveFileSpecW(s_szSubProgram); - PathAppendW(s_szSubProgram, L"shell-notify.exe"); + PathAppendW(s_szSubProgram, L"shell32_apitest_sub.exe"); if (!PathFileExistsW(s_szSubProgram)) { PathRemoveFileSpecW(s_szSubProgram); - PathAppendW(s_szSubProgram, L"testdata\\shell-notify.exe"); + PathAppendW(s_szSubProgram, L"testdata\\shell32_apitest_sub.exe"); if (!PathFileExistsW(s_szSubProgram)) { @@ -356,7 +356,7 @@ JustDoIt(INT nMode) HINSTANCE hinst = ShellExecuteW(NULL, NULL, s_szSubProgram, szParams, NULL, SW_SHOWNORMAL); if ((INT_PTR)hinst <= 32) { - skip("Unable to run shell-notify.exe.\n"); + skip("Unable to run shell32_apitest_sub.exe.\n"); return; } @@ -421,7 +421,7 @@ START_TEST(SHChangeNotify) { if (!GetSubProgramPath()) { - skip("shell-notify.exe not found\n"); + skip("shell32_apitest_sub.exe not found\n"); } JustDoIt(0); diff --git a/modules/rostests/apitests/shell32/shell-notify.cpp b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp similarity index 99% rename from modules/rostests/apitests/shell32/shell-notify.cpp rename to modules/rostests/apitests/shell32/shell32_apitest_sub.cpp index 367f43dc482..c0d3cc4d83e 100644 --- a/modules/rostests/apitests/shell32/shell-notify.cpp +++ b/modules/rostests/apitests/shell32/shell32_apitest_sub.cpp @@ -262,6 +262,9 @@ wWinMain(HINSTANCE hInstance, LPWSTR lpCmdLine, INT nCmdShow) { + if (lstrcmpiW(lpCmdLine, L"") == 0) + return 0; + s_nMode = _wtoi(lpCmdLine); WNDCLASSW wc; diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 9763afa4ea7..01219082ba3 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -14,6 +14,7 @@ extern void func_CShellLink(void); extern void func_CUserNotification(void); extern void func_DragDrop(void); extern void func_ExtractIconEx(void); +extern void func_FindExecutable(void); extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); @@ -43,6 +44,7 @@ const struct test winetest_testlist[] = { "CUserNotification", func_CUserNotification }, { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, + { "FindExecutable", func_FindExecutable }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL },

3 years, 4 months

[reactos] 03/03: [VBE] Check if DDC is supported before trying to read EDID

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08e9000496e4630b8f6c8… commit 08e9000496e4630b8f6c848df03aebfd4d74c547 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 29 21:37:03 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jun 5 23:38:05 2021 +0200 [VBE] Check if DDC is supported before trying to read EDID Also set Edx to 0 when reading Edid, as per specification. CORE-16695 --- win32ss/drivers/miniport/vbe/edid.c | 14 +++++++++++++- win32ss/drivers/videoprt/videoprt.c | 4 ---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/win32ss/drivers/miniport/vbe/edid.c b/win32ss/drivers/miniport/vbe/edid.c index a9ebe35dbbf..cde4fc35754 100644 --- a/win32ss/drivers/miniport/vbe/edid.c +++ b/win32ss/drivers/miniport/vbe/edid.c @@ -184,6 +184,19 @@ VBEReadEdid( VideoPortDebugPrint(Trace, "VBEMP: VBEReadEdid() called\n"); + /* + * Check if DDC1/DDC2 is supported + */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + if (VBE_GETRETURNCODE(BiosRegisters.Eax) != VBE_SUCCESS) + return FALSE; + if ((BiosRegisters.Ebx & 3) == 0) + return FALSE; + /* * Directly read EDID information */ @@ -191,7 +204,6 @@ VBEReadEdid( BiosRegisters.Eax = VBE_DDC; BiosRegisters.Ebx = VBE_DDC_READ_EDID; BiosRegisters.Ecx = ChildIndex; - BiosRegisters.Edx = 1; BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset; BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment; VBEDeviceExtension->Int10Interface.Int10CallBios( diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 5d4c54a3559..b57cff52594 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -1233,10 +1233,6 @@ VideoPortEnumerateChildren( { /* Mark it invalid */ ChildExtension->EdidValid = FALSE; - // FIXME: the following break workarounds CORE-16695 - // but prevents graphic cards to return an invalid - // EDID as first child, and a valid one as second child. - break; } } }

3 years, 4 months

[reactos] 02/03: [VIDEOPRT] Report monitor name instead of the generic 'Monitor' string

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa547041582fb13eed180… commit fa547041582fb13eed1804b2d44c49a99974e218 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 29 22:55:15 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jun 5 23:38:05 2021 +0200 [VIDEOPRT] Report monitor name instead of the generic 'Monitor' string --- win32ss/drivers/videoprt/child.c | 87 +++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/win32ss/drivers/videoprt/child.c b/win32ss/drivers/videoprt/child.c index bfca7069b1d..2c280850a8b 100644 --- a/win32ss/drivers/videoprt/child.c +++ b/win32ss/drivers/videoprt/child.c @@ -57,6 +57,60 @@ IntVideoPortGetMonitorId( return TRUE; } +BOOLEAN +NTAPI +IntVideoPortSearchDescriptor( + IN PUCHAR Descriptor, + IN UCHAR DescriptorID, + OUT PUCHAR* pDescriptorData) +{ + if (Descriptor[0] != 0 || Descriptor[1] != 0 || Descriptor[2] != 0) + return FALSE; + if (Descriptor[3] != DescriptorID) + return FALSE; + + *pDescriptorData = Descriptor + 4; + return TRUE; +} + +BOOLEAN +NTAPI +IntVideoPortSearchDescriptors( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN UCHAR DescriptorID, + OUT PUCHAR* pDescriptorData) +{ + if (!ChildExtension->EdidValid) + return FALSE; + + if (IntVideoPortSearchDescriptor(ChildExtension->ChildDescriptor + 0x36, DescriptorID, pDescriptorData)) + return TRUE; + if (IntVideoPortSearchDescriptor(ChildExtension->ChildDescriptor + 0x48, DescriptorID, pDescriptorData)) + return TRUE; + if (IntVideoPortSearchDescriptor(ChildExtension->ChildDescriptor + 0x5A, DescriptorID, pDescriptorData)) + return TRUE; + if (IntVideoPortSearchDescriptor(ChildExtension->ChildDescriptor + 0x6C, DescriptorID, pDescriptorData)) + return TRUE; + + /* FIXME: search in extension? */ + return FALSE; +} + +BOOLEAN +NTAPI +IntVideoPortGetMonitorDescription( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + OUT PCHAR* pMonitorDescription) +{ + PUCHAR MonitorDescription; + + if (!IntVideoPortSearchDescriptors(ChildExtension, 0xFC, &MonitorDescription)) + return FALSE; + + *pMonitorDescription = (PCHAR)MonitorDescription; + return TRUE; +} + NTSTATUS NTAPI IntVideoPortChildQueryId( IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, @@ -188,7 +242,9 @@ IntVideoPortChildQueryText( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - PWCHAR Buffer, StaticBuffer; + ANSI_STRING StringA; + UNICODE_STRING StringU; + NTSTATUS Status; if (IrpSp->Parameters.QueryDeviceText.DeviceTextType != DeviceTextDescription) return Irp->IoStatus.Status; @@ -196,27 +252,36 @@ IntVideoPortChildQueryText( switch (ChildExtension->ChildType) { case Monitor: - /* FIXME: We can return a better description I think */ - StaticBuffer = L"Monitor"; + if (IntVideoPortGetMonitorDescription(ChildExtension, + &StringA.Buffer)) + { + StringA.Buffer++; /* Skip reserved byte */ + StringA.MaximumLength = 13; + for (StringA.Length = 0; + StringA.Length < StringA.MaximumLength && StringA.Buffer[StringA.Length] != '\n'; + StringA.Length++) + ; + } + else + RtlInitAnsiString(&StringA, "Monitor"); break; case VideoChip: /* FIXME: No idea what we return here */ - StaticBuffer = L"Video chip"; + RtlInitAnsiString(&StringA, "Video chip"); break; default: /* Other */ - StaticBuffer = L"Other device"; + RtlInitAnsiString(&StringA, "Other device"); break; } - Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); - if (!Buffer) return STATUS_NO_MEMORY; - - RtlCopyMemory(Buffer, StaticBuffer, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + Status = RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); + if (!NT_SUCCESS(Status)) + return Status; - INFO_(VIDEOPRT, "Reporting description: %S\n", Buffer); - Irp->IoStatus.Information = (ULONG_PTR)Buffer; + INFO_(VIDEOPRT, "Reporting description: %S\n", StringU.Buffer); + Irp->IoStatus.Information = (ULONG_PTR)StringU.Buffer; return STATUS_SUCCESS; }

3 years, 4 months

[reactos] 01/03: [VIDEOPRT] Give to each device its own entry in HKLM\SYSTEM\CurrentControlSet\Services

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ae6bd7453766c1069279… commit 2ae6bd7453766c10692791d397b6a130138a3581 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 29 08:29:30 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jun 5 23:38:05 2021 +0200 [VIDEOPRT] Give to each device its own entry in HKLM\SYSTEM\CurrentControlSet\Services This is required if you have two graphic cards using the same driver. --- win32ss/drivers/videoprt/registry.c | 24 +++++++++++++++++++++--- win32ss/drivers/videoprt/videoprt.c | 2 ++ win32ss/drivers/videoprt/videoprt.h | 1 + 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 362c251d21a..68e3d403353 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -531,18 +531,33 @@ NTSTATUS NTAPI IntCreateRegistryPath( IN PCUNICODE_STRING DriverRegistryPath, + IN ULONG DeviceNumber, OUT PUNICODE_STRING DeviceRegistryPath) { static WCHAR RegistryMachineSystem[] = L"\\REGISTRY\\MACHINE\\SYSTEM\\"; static WCHAR CurrentControlSet[] = L"CURRENTCONTROLSET\\"; static WCHAR ControlSet[] = L"CONTROLSET"; static WCHAR Insert1[] = L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; - static WCHAR Insert2[] = L"\\Device0"; + static WCHAR Insert2[] = L"\\Device"; + UNICODE_STRING DeviceNumberString; + WCHAR DeviceNumberBuffer[20]; BOOLEAN Valid; UNICODE_STRING AfterControlSet; + NTSTATUS Status; AfterControlSet = *DriverRegistryPath; + /* Convert DeviceNumber to string */ + DeviceNumberString.Length = 0; + DeviceNumberString.MaximumLength = sizeof(DeviceNumberBuffer); + DeviceNumberString.Buffer = DeviceNumberBuffer; + Status = RtlIntegerToUnicodeString(DeviceNumber, 10, &DeviceNumberString); + if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "RtlIntegerToUnicodeString(%u) returned 0x%08x\n", DeviceNumber, Status); + return Status; + } + /* Check if path begins with \\REGISTRY\\MACHINE\\SYSTEM\\ */ Valid = (DriverRegistryPath->Length > sizeof(RegistryMachineSystem) && 0 == _wcsnicmp(DriverRegistryPath->Buffer, RegistryMachineSystem, @@ -586,7 +601,8 @@ IntCreateRegistryPath( if (Valid) { - DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert1) + sizeof(Insert2); + DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert1) + sizeof(Insert2) + + DeviceNumberString.Length; DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(PagedPool, DeviceRegistryPath->MaximumLength, TAG_VIDEO_PORT); @@ -600,6 +616,7 @@ IntCreateRegistryPath( RtlAppendUnicodeToString(DeviceRegistryPath, Insert1); RtlAppendUnicodeStringToString(DeviceRegistryPath, &AfterControlSet); RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); + RtlAppendUnicodeStringToString(DeviceRegistryPath, &DeviceNumberString); /* Check if registry key exists */ Valid = NT_SUCCESS(RtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, DeviceRegistryPath->Buffer)); @@ -620,7 +637,7 @@ IntCreateRegistryPath( /* If path doesn't point to *ControlSet*, use DriverRegistryPath directly */ if (!Valid) { - DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert2); + DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert2) + DeviceNumberString.Length; DeviceRegistryPath->Buffer = ExAllocatePoolWithTag(NonPagedPool, DeviceRegistryPath->MaximumLength, TAG_VIDEO_PORT); @@ -630,6 +647,7 @@ IntCreateRegistryPath( RtlCopyUnicodeString(DeviceRegistryPath, DriverRegistryPath); RtlAppendUnicodeToString(DeviceRegistryPath, Insert2); + RtlAppendUnicodeStringToString(DeviceRegistryPath, &DeviceNumberString); } DPRINT("Formatted registry key '%wZ' -> '%wZ'\n", diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 6c54e16fbef..5d4c54a3559 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -170,6 +170,7 @@ IntVideoPortCreateAdapterDeviceObject( /* Get the registry path associated with this device. */ Status = IntCreateRegistryPath(&DriverExtension->RegistryPath, + DriverExtension->InitializationData.StartingDeviceNumber, &DeviceExtension->RegistryPath); if (!NT_SUCCESS(Status)) { @@ -242,6 +243,7 @@ IntVideoPortCreateAdapterDeviceObject( IntCreateNewRegistryPath(DeviceExtension); IntSetupDeviceSettingsKey(DeviceExtension); + DriverExtension->InitializationData.StartingDeviceNumber++; /* Remove the initailizing flag */ (*DeviceObject)->Flags &= ~DO_DEVICE_INITIALIZING; diff --git a/win32ss/drivers/videoprt/videoprt.h b/win32ss/drivers/videoprt/videoprt.h index 7c559def846..408ca0b2b87 100644 --- a/win32ss/drivers/videoprt/videoprt.h +++ b/win32ss/drivers/videoprt/videoprt.h @@ -342,6 +342,7 @@ NTSTATUS NTAPI IntCreateRegistryPath( IN PCUNICODE_STRING DriverRegistryPath, + IN ULONG DeviceNumber, OUT PUNICODE_STRING DeviceRegistryPath);

3 years, 4 months

[reactos] 02/02: [ATL_APITEST] Add some testcases for CString 'operator !='

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8902450bcd2c24815aba… commit e8902450bcd2c24815aba83536472b27743a8d19 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 5 22:16:41 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 5 23:28:38 2021 +0200 [ATL_APITEST] Add some testcases for CString 'operator !=' --- modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/CString.inl | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 8f12a5071aa..bc3184793de 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE CSimpleArray.cpp CSimpleMap.cpp CString.cpp + CString.inl SubclassWindow.cpp) list(APPEND PCH_SKIP_SOURCE diff --git a/modules/rostests/apitests/atl/CString.inl b/modules/rostests/apitests/atl/CString.inl index c0d661cfb8e..865804dc3a1 100644 --- a/modules/rostests/apitests/atl/CString.inl +++ b/modules/rostests/apitests/atl/CString.inl @@ -122,10 +122,27 @@ TEST_NAMEX(compare) ok(s2[0] == _X('s'), "Expected s2[0] to be s, was: %c\n", (char)s2[0]); ok(s1 == _X("SOME TEXT 1!"), "Expected s1 to be 'SOME TEXT 1!', was: %s\n", dbgstrx(s1)); + ok(s1 != _X("SOME TEXT 2!"), "Expected s2 not to match 'SOME TEXT 2!', was: %s\n", dbgstrx(s1)); + ok(!(s1 != _X("SOME TEXT 1!")), "Expected s1 to be 'SOME TEXT 1!', was: %s\n", dbgstrx(s1)); CStringX s3 = s1.MakeLower(); ok(s1 == _X("some text 1!"), "Expected s1 to be 'some text 1!', was: %s\n", dbgstrx(s1)); ok(s1 == s3, "Expected s1 and s3 to be equal: '%s' == '%s'\n", dbgstrx(s1), dbgstrx(s3)); + ok(!(s1 != s3), "Expected s1 and s3 to be equal: !('%s' == '%s')\n", dbgstrx(s1), dbgstrx(s3)); + + // Compare as chars + s1 = _X("Q"); + ok(s1 == 'Q', "Expected s1 to be 'Q', was: %s\n", dbgstrx(s1)); + ok(!(s1 != 'Q'), "Expected s1 to be 'Q' (!=), was: %s\n", dbgstrx(s1)); + ok(s1 != 'S', "Expected s1 to be different from 'S', was: %s\n", dbgstrx(s1)); + + s1.Empty(); + ok(s1 != 'S', "Expected s1 to be different from 'S', was: %s\n", dbgstrx(s1)); + ok(s1 != 'Q', "Expected s1 to be different from 'S', was: %s\n", dbgstrx(s1)); + + s1 = _X("QQ"); + ok(s1 != 'S', "Expected s1 to be different from 'S', was: %s\n", dbgstrx(s1)); + ok(s1 != 'Q', "Expected s1 to be different from 'S', was: %s\n", dbgstrx(s1)); } @@ -522,7 +539,6 @@ TEST_NAMEX(tokenize) // Calling with an empty pszTokens behaves exactly the same res = str.Tokenize(_X(""), nCurPos); - ok(res == _X(""), "Expected str to be 'st', was: %s\n", dbgstrx(res)); ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); ok_dec(nCurPos, -1); }

3 years, 4 months

[reactos] 01/02: [ATL] Implement CString 'operator !='

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ea3814a2204271ee459b… commit 5ea3814a2204271ee459b1723fdc39832683370d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 5 22:16:08 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 5 23:28:38 2021 +0200 [ATL] Implement CString 'operator !=' --- sdk/lib/atl/cstringt.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index 0afe3f4763f..afd9f7971f2 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -533,6 +533,43 @@ public: return str2.GetLength() == 1 && str2[0] == ch1; } + friend bool operator!=(const CStringT& str1, const CStringT& str2) throw() + { + return str1.Compare(str2) != 0; + } + + friend bool operator!=(const CStringT& str1, PCXSTR psz2) throw() + { + return str1.Compare(psz2) != 0; + } + + friend bool operator!=(const CStringT& str1, PCYSTR psz2) throw() + { + CStringT tmp(psz2, str1.GetManager()); + return tmp.Compare(str1) != 0; + } + + friend bool operator!=(const CStringT& str1, XCHAR ch2) throw() + { + return str1.GetLength() != 1 || str1[0] != ch2; + } + + friend bool operator!=(PCXSTR psz1, const CStringT& str2) throw() + { + return str2.Compare(psz1) != 0; + } + + friend bool operator!=(PCYSTR psz1, const CStringT& str2) throw() + { + CStringT tmp(psz1, str2.GetManager()); + return tmp.Compare(str2) != 0; + } + + friend bool operator!=(XCHAR ch1, const CStringT& str2) throw() + { + return str2.GetLength() != 1 || str2[0] != ch1; + } + CStringT& operator+=(_In_ const CThisSimpleString& str) { CThisSimpleString::operator+=(str);

3 years, 4 months

[reactos] 01/01: [SYSSETUP] Use the calculated full path

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d68fe209f50e6232bee2… commit 1d68fe209f50e6232bee28cdf385f0541abdd7bc Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 5 22:14:34 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jun 5 22:14:34 2021 +0200 [SYSSETUP] Use the calculated full path --- dll/win32/syssetup/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index ba8fd226b64..5feefa3611b 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -467,7 +467,7 @@ RegisterTypeLibraries(HINF hinf, LPCWSTR szSection) p = PathAddBackslash(szPath); wcscpy(p, szName); - hmod = LoadLibraryW(szName); + hmod = LoadLibraryW(szPath); if (hmod == NULL) { FatalError("LoadLibraryW failed\n");

3 years, 4 months

[reactos] 01/01: [MSI] setup should not enumerate read-only CDRoms as install-targets CORE-14432

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=864e20b881130cbc9668b… commit 864e20b881130cbc9668b8e253a31b8c325e9b99 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jun 5 21:27:01 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jun 5 21:27:40 2021 +0200 [MSI] setup should not enumerate read-only CDRoms as install-targets CORE-14432 We decided to check a bit different than Wine currently does. Wine checks for if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && flags & FILE_READ_ONLY_VOLUME) to exclude read-only-media while we (for now) check for if (GetDriveTypeW(ptr) == DRIVE_CDROM) For now this gives us the benefit of covering also CDROM drives, that do not have a CD put into it. That does not work properly for us with the Wine patch yet, but it does for Wine! So this maybe points to some other bug in ros, maybe in our CDROM(FS)-drivers? In the future we should also test this on other read-only-media in Windows e.g. a read-only USB stick to decide whether we want to stick with our current solution or whether we want to switch to Wines solution or whether we want to logically OR both conditions! Thanks to Doug Lyons for providing what *currently* does work best for us! VBox https://reactos.org/testman/compare.php?ids=77537,77546 (no change) KVM https://reactos.org/testman/compare.php?ids=77531,77541 (no change) --- dll/win32/msi/dialog.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 376fa491fd8..2ed6815ad6b 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3237,6 +3237,13 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { +#ifdef __REACTOS__ + if (GetDriveTypeW(ptr) == DRIVE_CDROM) + { + ptr += lstrlenW(ptr) + 1; + continue; + } +#endif lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0;

3 years, 4 months

[reactos] 01/01: [MPR] spec: Add stubs, document parameter types, stub-enable 2 functions (#3696)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83fcd65700e8cf6d0c07c… commit 83fcd65700e8cf6d0c07c81d85a07e68c5d87cdc Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 5 20:49:41 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 5 20:49:41 2021 +0200 [MPR] spec: Add stubs, document parameter types, stub-enable 2 functions (#3696) * Add 20 stubs from mpr.dll v5.2.3790.3959. * Document some parameter types from https://github.com/Microsoft/winfile/ * Change WNetGetDirectoryType[A|W] to no-op stubs CORE-14376 --- dll/win32/mpr/mpr.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dll/win32/mpr/mpr.spec b/dll/win32/mpr/mpr.spec index d8f25709c5d..f1d313fa043 100644 --- a/dll/win32/mpr/mpr.spec +++ b/dll/win32/mpr/mpr.spec @@ -23,6 +23,7 @@ 24 stdcall @(ptr) MPR_Free 25 stdcall @(ptr long) _MPR_25 +@ stub I_MprSaveConn @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) @ stdcall MultinetGetErrorTextA(long long long) @@ -44,6 +45,7 @@ @ stdcall PwdGetPasswordStatusW(wstr long ptr) @ stdcall PwdSetPasswordStatusA(str long long) @ stdcall PwdSetPasswordStatusW(wstr long long) +@ stub RestoreConnectionA0 @ stdcall WNetAddConnection2A(ptr str str long) @ stdcall WNetAddConnection2W(ptr wstr wstr long) @ stdcall WNetAddConnection3A(long ptr str str long) @@ -60,9 +62,13 @@ @ stdcall WNetConnectionDialog1A(ptr) @ stdcall WNetConnectionDialog1W(ptr) @ stdcall WNetConnectionDialog(long long) +@ stub WNetConnectionDialog2 # (ptr long wstr long) +@ stub WNetDirectoryNotifyA +@ stub WNetDirectoryNotifyW # (ptr wstr long) @ stdcall WNetDisconnectDialog1A(ptr) @ stdcall WNetDisconnectDialog1W(ptr) @ stdcall WNetDisconnectDialog(long long) +@ stub WNetDisconnectDialog2 # (ptr long wstr long) @ stdcall WNetEnumCachedPasswords(str long long ptr long) @ stdcall WNetEnumResourceA(long ptr ptr ptr) @ stdcall WNetEnumResourceW(long ptr ptr ptr) @@ -70,11 +76,16 @@ @ stub WNetFMXGetPermCaps @ stub WNetFMXGetPermHelp @ stub WNetFormatNetworkNameA -@ stub WNetFormatNetworkNameW +@ stub WNetFormatNetworkNameW # (wstr wstr ptr ptr long long) @ stdcall WNetGetCachedPassword(ptr long ptr ptr long) +@ stub WNetGetConnection2A +@ stub WNetGetConnection2W # (wstr ptr ptr) +@ stub WNetGetConnection3A +@ stub WNetGetConnection3W @ stdcall WNetGetConnectionA(str ptr ptr) @ stdcall WNetGetConnectionW(wstr ptr ptr) -@ stub WNetGetDirectoryTypeA +@ stdcall -stub WNetGetDirectoryTypeA(str ptr long) +@ stdcall -stub WNetGetDirectoryTypeW(wstr ptr long) @ stub WNetGetHomeDirectoryA @ stub WNetGetHomeDirectoryW @ stdcall WNetGetLastErrorA(ptr ptr long ptr long) @@ -82,12 +93,16 @@ @ stdcall WNetGetNetworkInformationA(str ptr) @ stdcall WNetGetNetworkInformationW(wstr ptr) @ stub WNetGetPropertyTextA +@ stub WNetGetPropertyTextW # (long long wstr ptr long long) @ stdcall WNetGetProviderNameA(long ptr ptr) @ stdcall WNetGetProviderNameW(long ptr ptr) +@ stub WNetGetProviderTypeA +@ stub WNetGetProviderTypeW @ stdcall WNetGetResourceInformationA(ptr ptr ptr ptr) @ stdcall WNetGetResourceInformationW(ptr ptr ptr ptr) @ stdcall WNetGetResourceParentA(ptr ptr ptr) @ stdcall WNetGetResourceParentW(ptr ptr ptr) +@ stub WNetGetSearchDialog @ stdcall WNetGetUniversalNameA (str long ptr ptr) @ stdcall WNetGetUniversalNameW (wstr long ptr ptr) @ stdcall WNetGetUserA(str ptr ptr) @@ -101,12 +116,18 @@ @ stdcall WNetOpenEnumW(long long long ptr ptr) @ stub WNetPasswordChangeNotify @ stub WNetPropertyDialogA +@ stub WNetPropertyDialogW # (ptr long long wstr long) @ stdcall WNetRemoveCachedPassword(ptr long long) @ stub WNetRestoreConnection +@ stub WNetRestoreConnection2W @ stdcall WNetRestoreConnectionA(long str) @ stdcall WNetRestoreConnectionW(long wstr) +# WNetRestoreSingleConnectionW # (ptr wstr long) # Not in WS03 yet? @ stdcall WNetSetConnectionA(str long ptr) @ stdcall WNetSetConnectionW(wstr long ptr) +@ stub WNetSetLastErrorA # {long str str) +@ stub WNetSetLastErrorW # {long wstr wstr) +@ stub WNetSupportGlobalEnum @ stdcall WNetUseConnectionA(long ptr str str long str ptr ptr) @ stdcall WNetUseConnectionW(long ptr wstr wstr long wstr ptr ptr) @ stdcall WNetVerifyPasswordA(str ptr)

3 years, 4 months

[reactos] 01/01: [RAPPS] Implement support for architecture specific sections

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f5f614c7abafd5a2a0a4… commit 1f5f614c7abafd5a2a0a41480e596f7497c4a32d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jun 4 15:20:21 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 5 19:17:05 2021 +0200 [RAPPS] Implement support for architecture specific sections See CORE-17616 --- base/applications/rapps/available.cpp | 9 +++++++++ base/applications/rapps/include/misc.h | 14 ++++++++++++++ base/applications/rapps/misc.cpp | 28 ++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 075afd7063a..01f8fe5facf 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -516,6 +516,15 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc, PVOID param) // set a timestamp for the next time Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); + + /* Check if we have the download URL */ + if (Info->m_szUrlDownload.IsEmpty()) + { + /* Can't use it, delete it */ + delete Info; + continue; + } + m_InfoList.AddTail(Info); skip_if_cached: diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 86456b0871b..7bb6afcecb5 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -6,6 +6,19 @@ #define EPOCH_DIFF 116444736000000000 //FILETIME starts from 1601-01-01 UTC, UnixTime starts from 1970-01-01 #define RATE_DIFF 10000000 +#ifdef _M_IX86 +#define CurrentArchitecture L"x86" +#elif defined(_M_AMD64) +#define CurrentArchitecture L"amd64" +#elif defined(_M_ARM) +#define CurrentArchitecture L"arm" +#elif defined(_M_ARM64) +#define CurrentArchitecture L"arm64" +#elif defined(_M_IA64) +#define CurrentArchitecture L"ia64" +#elif defined(_M_PPC) +#define CurrentArchitecture L"ppc" +#endif INT GetWindowWidth(HWND hwnd); INT GetWindowHeight(HWND hwnd); @@ -41,6 +54,7 @@ class CConfigParser ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); VOID CacheINILocale(); + BOOL GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString); public: CConfigParser(const ATL::CStringW& FileName = ""); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 54a965bce13..8f1310d2320 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -351,13 +351,13 @@ VOID CConfigParser::CacheINILocale() m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale; } -BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +BOOL CConfigParser::GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString) { DWORD dwResult; LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); // 1st - find localized strings (e.g. "Section.0c0a") - dwResult = GetPrivateProfileStringW(m_szCachedINISectionLocale.GetString(), + dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocale + Suffix).GetString(), KeyName.GetString(), NULL, ResultStringBuffer, @@ -367,7 +367,7 @@ BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& Resul if (!dwResult) { // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") - dwResult = GetPrivateProfileStringW(m_szCachedINISectionLocaleNeutral.GetString(), + dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocaleNeutral + Suffix).GetString(), KeyName.GetString(), NULL, ResultStringBuffer, @@ -376,7 +376,7 @@ BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& Resul if (!dwResult) { // 3rd - if they weren't present fallback to standard english strings (just "Section") - dwResult = GetPrivateProfileStringW(L"Section", + dwResult = GetPrivateProfileStringW((ATL::CStringW(L"Section") + Suffix).GetString(), KeyName.GetString(), NULL, ResultStringBuffer, @@ -389,6 +389,26 @@ BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& Resul return (dwResult != 0 ? TRUE : FALSE); } +BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +{ + /* First try */ + if (GetStringWorker(KeyName, L"." CurrentArchitecture, ResultString)) + { + return TRUE; + } + +#ifndef _M_IX86 + /* On non-x86 architecture we need the architecture specific URL */ + if (KeyName == L"URLDownload") + { + return FALSE; + } +#endif + + /* Fall back to default */ + return GetStringWorker(KeyName, L"", ResultString); +} + BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) { ATL::CStringW Buffer;

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2021