Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [TCPSVCS] Remove hardcoded C drive letter (#800)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0a1cb52becb67f4839de… commit b0a1cb52becb67f4839deba5b82f02c3f543adee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Aug 28 19:45:03 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 28 12:45:03 2018 +0200 [TCPSVCS] Remove hardcoded C drive letter (#800) CORE-13228, CORE-13235 For USETUP, add a comment about why the code uses it when adding a boot-sector boot entry to NTLDR. CORE-13226 --- base/services/tcpsvcs/log.c | 12 +++++++++--- base/services/tcpsvcs/tcpsvcs.h | 1 + base/setup/usetup/bootsup.c | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/base/services/tcpsvcs/log.c b/base/services/tcpsvcs/log.c index 3b2d467d71..ef25909b0b 100644 --- a/base/services/tcpsvcs/log.c +++ b/base/services/tcpsvcs/log.c @@ -12,7 +12,7 @@ #define DEBUG static LPWSTR lpEventSource = L"tcpsvcs"; -static LPCWSTR lpLogFileName = L"C:\\tcpsvcs_log.log"; +static WCHAR szLogFileName[MAX_PATH]; static HANDLE hLogFile = NULL; static OVERLAPPED olWrite; @@ -47,7 +47,7 @@ LogToEventLog(LPCWSTR lpMsg, static BOOL OpenLogFile() { - hLogFile = CreateFileW(lpLogFileName, + hLogFile = CreateFileW(szLogFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, @@ -212,13 +212,19 @@ InitLogging() #ifdef DEBUG BOOL bRet = FALSE; + if (!GetEnvironmentVariableW(L"SystemDrive", szLogFileName, ARRAYSIZE(szLogFileName))) + { + StringCchCopyW(szLogFileName, ARRAYSIZE(szLogFileName), L"C:"); + } + StringCchCatW(szLogFileName, ARRAYSIZE(szLogFileName), L"\\tcpsvcs_log.log"); + ZeroMemory(&olWrite, sizeof(OVERLAPPED)); olWrite.Offset = 0xFFFFFFFF; olWrite.OffsetHigh = 0xFFFFFFFF; olWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); if (olWrite.hEvent) { - DeleteFileW(lpLogFileName); + DeleteFileW(szLogFileName); if (OpenLogFile()) { diff --git a/base/services/tcpsvcs/tcpsvcs.h b/base/services/tcpsvcs/tcpsvcs.h index b024e7c251..9c5b16b5ce 100644 --- a/base/services/tcpsvcs/tcpsvcs.h +++ b/base/services/tcpsvcs/tcpsvcs.h @@ -9,6 +9,7 @@ #define _INC_WINDOWS #include <winsock2.h> #include <tchar.h> +#include <strsafe.h> #define LOG_FILE 1 #define LOG_EVENTLOG 2 diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index 309e096d39..37cd680029 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2378,6 +2378,8 @@ InstallFatBootcodeToPartition( /* Update 'boot.ini' */ CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"boot.ini"); + /* Windows' NTLDR loads an external bootsector file when the specified drive + letter is C:, otherwise it will interpret it as a boot DOS path specifier. */ DPRINT1("Update 'boot.ini': %S\n", DstPath); Status = UpdateBootIni(DstPath, L"C:\\bootsect.ros",

6 years, 3 months

01/01: [CDFS] Properly check for legal names in CdIsLegalName()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d0596afe188a45b975b2… commit 9d0596afe188a45b975b287de74a10401ef6ad4a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Aug 28 07:48:44 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Aug 28 07:50:58 2018 +0200 [CDFS] Properly check for legal names in CdIsLegalName() Up to now, it was working by chance. Indeed, due to the invalid ASCII check performed before calling FsRtlIsAnsiCharacterLegalHpfs(), the macro is improperly called and overruns the FsRtlLegalAnsiCharacterArray buffer. Fortunately, up to now, right after that buffer in kernel binary there are strings which are more or less consistent with the flags that are expected by the macro, causing a decent behavior of FsRtlIsAnsiCharacterLegalHpfs() even for extended ASCII characters (whereas FsRtlIsAnsiCharacterLegalHpfs() is only designed for ASCII characters). But this is a totally out of control and wrong behavior. A single change in the way the kernel was built could have caused the CDFS driver not to work as previously. I have made the choice to allow any extended ASCII character as done for the unicode characters. This is a good compromise to avoid drastic regressions for users having extended ASCII characters in their CD file names. This imports proposed upstream commit 1b6b625641dffb49951e60398e1a9c672318ea71 See pull request https://github.com/Microsoft/Windows-driver-samples/pull/278 CORE-14067 --- drivers/filesystems/cdfs/namesup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/filesystems/cdfs/namesup.c b/drivers/filesystems/cdfs/namesup.c index 96e3aa3d3e..6f375f56ec 100644 --- a/drivers/filesystems/cdfs/namesup.c +++ b/drivers/filesystems/cdfs/namesup.c @@ -410,7 +410,17 @@ Return Value: Wchar < Add2Ptr( FileName->Buffer, FileName->Length, PWCHAR ); Wchar++) { +#ifndef __REACTOS__ if ((*Wchar < 0xff) && +#else + // + // Check whether ASCII characters are legal. + // We will consider the rest of the characters + // (extended ASCII and unicode) as legal. + // + + if ((*Wchar < 0x80) && +#endif !FsRtlIsAnsiCharacterLegalHpfs( *Wchar, FALSE ) && (*Wchar != L'"') && (*Wchar != L'<') &&

6 years, 3 months

01/01: [USETUP] Progress-bar: minor improvements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdb9f03236fe15a46e042… commit cdb9f03236fe15a46e042900af50efc56b11684a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 27 23:55:58 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 27 23:55:58 2018 +0200 [USETUP] Progress-bar: minor improvements. - Simplify the usage of the PUPDATE_PROGRESS callback. - Add the possibility of specifying an initial non-zero StepCount when creating the progress-bar (using the -Ex version), so that it can be initially drawn with the expected initial count. Of course ProgressSetStepCount() can continue to be used. --- base/setup/usetup/progress.c | 36 +++++++++++++++++------------------- base/setup/usetup/progress.h | 3 ++- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/base/setup/usetup/progress.c b/base/setup/usetup/progress.c index ebbc715cb1..1d095aeb6d 100644 --- a/base/setup/usetup/progress.c +++ b/base/setup/usetup/progress.c @@ -19,25 +19,22 @@ static BOOLEAN NTAPI UpdateProgressPercentage( IN PPROGRESSBAR Bar, - IN BOOLEAN ComputeProgress, + IN BOOLEAN AlwaysUpdate, OUT PSTR Buffer, IN SIZE_T cchBufferSize) { // static PCSTR ProgressFormatText; ULONG OldProgress = Bar->Progress; - if (ComputeProgress) - { - /* Calculate the new percentage */ - if (Bar->StepCount == 0) - Bar->Progress = 0; - else - Bar->Progress = ((100 * Bar->CurrentStep + (Bar->StepCount / 2)) / Bar->StepCount); - } + /* Calculate the new percentage */ + if (Bar->StepCount == 0) + Bar->Progress = 0; + else + Bar->Progress = ((100 * Bar->CurrentStep + (Bar->StepCount / 2)) / Bar->StepCount); /* Build the progress string if it has changed */ if ( Bar->ProgressFormatText && - (!ComputeProgress || (Bar->Progress != OldProgress)) ) + (AlwaysUpdate || (Bar->Progress != OldProgress)) ) { RtlStringCchPrintfA(Buffer, cchBufferSize, Bar->ProgressFormatText, Bar->Progress); @@ -239,9 +236,9 @@ DrawProgressBar( if (Bar->DescriptionText) CONSOLE_SetTextXY(Bar->TextTop, Bar->TextRight, Bar->DescriptionText); - /* Display the progress */ + /* Always update and display the progress */ if (Bar->UpdateProgressProc && - Bar->UpdateProgressProc(Bar, FALSE, TextBuffer, ARRAYSIZE(TextBuffer))) + Bar->UpdateProgressProc(Bar, TRUE, TextBuffer, ARRAYSIZE(TextBuffer))) { coPos.X = Bar->Left + (Bar->Width - strlen(TextBuffer) + 1) / 2; coPos.Y = Bar->Top; @@ -281,6 +278,7 @@ CreateProgressBarEx( IN SHORT TextRight, IN BOOLEAN DoubleEdge, IN SHORT ProgressColour, + IN ULONG StepCount, IN PCSTR DescriptionText OPTIONAL, IN PCSTR ProgressFormatText OPTIONAL, IN PUPDATE_PROGRESS UpdateProgressProc OPTIONAL) @@ -307,14 +305,10 @@ CreateProgressBarEx( Bar->DescriptionText = DescriptionText; Bar->ProgressFormatText = ProgressFormatText; - Bar->StepCount = 0; - Bar->CurrentStep = 0; - Bar->UpdateProgressProc = UpdateProgressProc; - Bar->Progress = 0; - Bar->Pos = 0; - DrawProgressBar(Bar); + /* Reset the progress bar counts and initially draw it */ + ProgressSetStepCount(Bar, StepCount); return Bar; } @@ -335,6 +329,7 @@ CreateProgressBar( TextTop, TextRight, DoubleEdge, FOREGROUND_YELLOW | BACKGROUND_BLUE, + 0, DescriptionText, "%-3lu%%", UpdateProgressPercentage); @@ -356,6 +351,9 @@ ProgressSetStepCount( Bar->CurrentStep = 0; Bar->StepCount = StepCount; + Bar->Progress = 0; + Bar->Pos = 0; + DrawProgressBar(Bar); } @@ -383,7 +381,7 @@ ProgressSetStep( /* Update the progress and redraw it if it has changed */ if (Bar->UpdateProgressProc && - Bar->UpdateProgressProc(Bar, TRUE, TextBuffer, ARRAYSIZE(TextBuffer))) + Bar->UpdateProgressProc(Bar, FALSE, TextBuffer, ARRAYSIZE(TextBuffer))) { coPos.X = Bar->Left + (Bar->Width - strlen(TextBuffer) + 1) / 2; coPos.Y = Bar->Top; diff --git a/base/setup/usetup/progress.h b/base/setup/usetup/progress.h index 1cc5ed3ce7..e66040419b 100644 --- a/base/setup/usetup/progress.h +++ b/base/setup/usetup/progress.h @@ -31,7 +31,7 @@ struct _PROGRESSBAR; typedef BOOLEAN (NTAPI *PUPDATE_PROGRESS)( IN struct _PROGRESSBAR* Bar, - IN BOOLEAN ComputeProgress, + IN BOOLEAN AlwaysUpdate, OUT PSTR Buffer, IN SIZE_T cchBufferSize); @@ -76,6 +76,7 @@ CreateProgressBarEx( IN SHORT TextRight, IN BOOLEAN DoubleEdge, IN SHORT ProgressColour, + IN ULONG StepCount, IN PCSTR DescriptionText OPTIONAL, IN PCSTR ProgressFormatText OPTIONAL, IN PUPDATE_PROGRESS UpdateProgressProc OPTIONAL);

6 years, 3 months

02/02: [LDR] Load kernel32 in LdrpInitializeProcess. This allows kernel32 to register itself for manifest probing when loading dlls CORE-9219

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=191dceb0346764dc30e78… commit 191dceb0346764dc30e78646289d258d8c9ee862 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 24 00:15:02 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 27 20:05:00 2018 +0200 [LDR] Load kernel32 in LdrpInitializeProcess. This allows kernel32 to register itself for manifest probing when loading dlls CORE-9219 --- dll/ntdll/ldr/ldrinit.c | 71 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 058a128bdf..14f0272dd3 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -24,6 +24,7 @@ HANDLE Wow64ExecOptionsKey; UNICODE_STRING ImageExecOptionsString = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"); UNICODE_STRING Wow64OptionsString = RTL_CONSTANT_STRING(L""); UNICODE_STRING NtDllString = RTL_CONSTANT_STRING(L"ntdll.dll"); +UNICODE_STRING Kernel32String = RTL_CONSTANT_STRING(L"kernel32.dll"); BOOLEAN LdrpInLdrInit; LONG LdrpProcessInitialized; @@ -41,6 +42,9 @@ extern PTEB LdrpTopLevelDllBeingLoadedTeb; // defined in rtlsupp.c! PLDR_DATA_TABLE_ENTRY LdrpCurrentDllInitializer; PLDR_DATA_TABLE_ENTRY LdrpNtDllDataTableEntry; +static NTSTATUS (WINAPI *Kernel32ProcessInitPostImportFunction)(VOID); +static BOOL (WINAPI *Kernel32BaseQueryModuleData)(IN LPSTR ModuleName, IN LPSTR Unk1, IN PVOID Unk2, IN PVOID Unk3, IN PVOID Unk4); + RTL_BITMAP TlsBitMap; RTL_BITMAP TlsExpansionBitMap; RTL_BITMAP FlsBitMap; @@ -729,23 +733,28 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) NextEntry = NextEntry->Flink; } + Status = STATUS_SUCCESS; + /* If we got a context, then we have to call Kernel32 for TS support */ if (Context) { /* Check if we have one */ - //if (Kernel32ProcessInitPostImportfunction) - //{ + if (Kernel32ProcessInitPostImportFunction) + { /* Call it */ - //Kernel32ProcessInitPostImportfunction(); - //} - + Status = Kernel32ProcessInitPostImportFunction(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LDR: LdrpRunInitializeRoutines - Failed running kernel32 post-import function, Status=0x%08lx\n", Status); + } + } /* Clear it */ - //Kernel32ProcessInitPostImportfunction = NULL; - //UNIMPLEMENTED; + Kernel32ProcessInitPostImportFunction = NULL; } /* No root entry? return */ - if (!LdrRootEntry) return STATUS_SUCCESS; + if (!LdrRootEntry) + return Status; /* Set the TLD TEB */ OldTldTeb = LdrpTopLevelDllBeingLoadedTeb; @@ -1603,7 +1612,8 @@ LdrpInitializeProcess(IN PCONTEXT Context, { RTL_HEAP_PARAMETERS HeapParameters; ULONG ComSectionSize; - //ANSI_STRING FunctionName = RTL_CONSTANT_STRING("BaseQueryModuleData"); + ANSI_STRING BaseProcessInitPostImportName = RTL_CONSTANT_STRING("BaseProcessInitPostImport"); + ANSI_STRING BaseQueryModuleDataName = RTL_CONSTANT_STRING("BaseQueryModuleData"); PVOID OldShimData; OBJECT_ATTRIBUTES ObjectAttributes; //UNICODE_STRING LocalFileName, FullImageName; @@ -2120,11 +2130,46 @@ LdrpInitializeProcess(IN PCONTEXT Context, DPRINT1("We don't support .NET applications yet\n"); } - /* FIXME: Load support for Terminal Services */ - if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI || + NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) { - /* Load kernel32 and call BasePostImportInit... */ - DPRINT("Unimplemented codepath!\n"); + PVOID Kernel32BaseAddress; + PVOID FunctionAddress; + + Status = LdrLoadDll(NULL, NULL, &Kernel32String, &Kernel32BaseAddress); + + if (!NT_SUCCESS(Status)) + { + if (ShowSnaps) + DPRINT1("LDR: Unable to load %wZ, Status=0x%08lx\n", &Kernel32String, Status); + return Status; + } + + Status = LdrGetProcedureAddress(Kernel32BaseAddress, + &BaseProcessInitPostImportName, + 0, + &FunctionAddress); + + if (!NT_SUCCESS(Status)) + { + if (ShowSnaps) + DPRINT1("LDR: Unable to find post-import process init function, Status=0x%08lx\n", &Kernel32String, Status); + return Status; + } + Kernel32ProcessInitPostImportFunction = FunctionAddress; + + Status = LdrGetProcedureAddress(Kernel32BaseAddress, + &BaseQueryModuleDataName, + 0, + &FunctionAddress); + + if (!NT_SUCCESS(Status)) + { + if (ShowSnaps) + DPRINT1("LDR: Unable to find BaseQueryModuleData, Status=0x%08lx\n", &Kernel32String, Status); + return Status; + } + Kernel32BaseQueryModuleData = FunctionAddress; } /* Walk the IAT and load all the DLLs */

6 years, 3 months

01/02: [NTDLL_APITEST] Various small fixes - Add a missing file - Add convenience targets for MSVC_IDE - Remove whitespace at the end of the lines

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66e40be8eb4ebd6579eec… commit 66e40be8eb4ebd6579eec0c51a5555274c135ffb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Aug 23 14:53:57 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 27 20:05:00 2018 +0200 [NTDLL_APITEST] Various small fixes - Add a missing file - Add convenience targets for MSVC_IDE - Remove whitespace at the end of the lines --- modules/rostests/apitests/ntdll/CMakeLists.txt | 17 +++++- .../RtlDosApplyFileIsolationRedirection_Ustr.c | 61 ++++++++++++---------- modules/rostests/apitests/ntdll/fil1.txt | 0 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 2bb13f2d3e..2ac63c8aa0 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -90,5 +90,20 @@ add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) - add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/fil1.txt" SUBDIR testdata) + +# Convenience target for running from IDE +if(MSVC_IDE) + set(NTDLL_APITEST_DATADIR $<TARGET_FILE_DIR:ntdll_apitest>/testdata/) + add_custom_command(TARGET ntdll_apitest + POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E make_directory ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_FILE:ntdll_apitest> ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy ntdll_apitest.exe.local ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy shell32.dll ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy test.dll ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy ntdlltest.manifest ${NTDLL_APITEST_DATADIR} + COMMAND "${CMAKE_COMMAND}" -E copy fil1.txt ${NTDLL_APITEST_DATADIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +endif() diff --git a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c index fb2b51694a..4dff2668be 100644 --- a/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosApplyFileIsolationRedirection_Ustr.c @@ -22,7 +22,7 @@ struct test_data WCHAR* ExpectedSubString; }; -struct test_data Tests[] = +struct test_data Tests[] = { /* Not redirected file */ {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"somefilesomefile", NULL}, @@ -33,6 +33,9 @@ struct test_data Tests[] = {__LINE__, STATUS_SUCCESS, L"COMCTL32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, {__LINE__, STATUS_SUCCESS, L"comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, {__LINE__, STATUS_SUCCESS, L"c:\\windows\\system32\\comctl32.DLL", L"\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82"}, + /* Files not redirected with sxs */ + {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"MSVCR90.DLL", NULL}, + {__LINE__, STATUS_SXS_KEY_NOT_FOUND, L"c:\\windows\\system32\\MSVCR90.DLL", NULL}, /* Files defined in the manifest, one exists, one doesn't */ {__LINE__, STATUS_SUCCESS, L"deptest.dll", EXPECT_IN_SAME_DIR}, {__LINE__, STATUS_SUCCESS, L"adllfile.dll", EXPECT_IN_SAME_DIR}, @@ -69,7 +72,7 @@ HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line) SetLastError(0xdeaddead); h = CreateActCtxW(&ActCtx); ok_(__FILE__, line)(h != INVALID_HANDLE_VALUE, "CreateActCtx failed for %S\n", FileName); - // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT + // In win10 last error is unchanged and in win2k3 it is ERROR_BAD_EXE_FORMAT ok_(__FILE__, line)(GetLastError() == ERROR_BAD_EXE_FORMAT || GetLastError() == 0xdeaddead, "Wrong last error %lu\n", GetLastError()); return h; @@ -148,7 +151,7 @@ void TestBuffers() RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - NULL, + NULL, NULL, NULL, &DynamicString, @@ -161,8 +164,8 @@ void TestBuffers() RtlInitEmptyUnicodeString(&Param, NULL, 0); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, NULL, &DynamicString, &StringUsed, @@ -176,8 +179,8 @@ void TestBuffers() Param.Buffer = L"comctl32.dllcrapcrap"; RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, NULL, &DynamicString, &StringUsed, @@ -190,8 +193,8 @@ void TestBuffers() RtlInitUnicodeString(&Param, L"comctl32.dll"); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, NULL, &DynamicString, &StringUsed, @@ -203,8 +206,8 @@ void TestBuffers() RtlInitUnicodeString(&Param, L"comctl32"); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, NULL, &DynamicString, &StringUsed, @@ -216,8 +219,8 @@ void TestBuffers() RtlInitUnicodeString(&Param, L"comctl32"); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - &DotDll, + &Param, + &DotDll, NULL, &DynamicString, &StringUsed, @@ -230,7 +233,7 @@ void TestBuffers() RtlInitUnicodeString(&Param, L"comctl32.dll"); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, + &Param, NULL, NULL, &DynamicString, @@ -254,8 +257,8 @@ void TestBuffers() StaticString.MaximumLength = sizeof(buffer); Param = StaticString; Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, &StaticString, NULL, &StringUsed, @@ -269,8 +272,8 @@ void TestBuffers() StaticString.Length = sizeof(L"comctl32.dll"); StaticString.MaximumLength = sizeof(buffer); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &StaticString, - NULL, + &StaticString, + NULL, &StaticString, NULL, &StringUsed, @@ -282,8 +285,8 @@ void TestBuffers() RtlInitUnicodeString(&Param, L"comctl32.dll"); RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer)); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, &StaticString, NULL, &StringUsed, @@ -301,8 +304,8 @@ void TestBuffers() RtlInitEmptyUnicodeString(&StaticString, buffer, 5 * sizeof(WCHAR)); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, &StaticString, NULL, &StringUsed, @@ -315,8 +318,8 @@ void TestBuffers() RtlInitEmptyUnicodeString(&StaticString, buffer, sizeof(buffer)); RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, &StaticString, &DynamicString, &StringUsed, @@ -341,8 +344,8 @@ void TestBuffers() RtlInitEmptyUnicodeString(&DynamicString, NULL, 0); StaticString.Buffer[0] = 1; Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, - &Param, - NULL, + &Param, + NULL, &StaticString, &DynamicString, &StringUsed, @@ -374,7 +377,7 @@ START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) HANDLE h = _CreateActCtxFromFile(L"ntdlltest.manifest", __LINE__); BOOL bactivated = FALSE; ULONG_PTR cookie; - + if (h != INVALID_HANDLE_VALUE) bactivated = ActivateActCtx(h, &cookie); @@ -396,7 +399,7 @@ START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) separator = wcsrchr(TestPath, L'\\'); separator++; wcscpy(separator, L"testdata\\ntdll_apitest.exe RtlDosApplyFileIsolationRedirection_Ustr DoTest"); - + created = CreateProcessW(NULL, TestPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(created, "Expected CreateProcess to succeed\n"); if (created) @@ -406,4 +409,4 @@ START_TEST(RtlDosApplyFileIsolationRedirection_Ustr) CloseHandle(pi.hProcess); } } -} \ No newline at end of file +} diff --git a/modules/rostests/apitests/ntdll/fil1.txt b/modules/rostests/apitests/ntdll/fil1.txt new file mode 100644 index 0000000000..e69de29bb2

6 years, 3 months

01/01: [COMCTL32] Unregister some classes that were registered. This should help fix some crashes.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffae49deaf12bb58771ed… commit ffae49deaf12bb58771ed8c18c946f623d7e327a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Aug 24 15:59:57 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 27 19:49:57 2018 +0200 [COMCTL32] Unregister some classes that were registered. This should help fix some crashes. --- dll/win32/comctl32/button.c | 4 ++-- dll/win32/comctl32/combo.c | 7 +++++++ dll/win32/comctl32/comctl32.h | 7 ++++++- dll/win32/comctl32/commctrl.c | 6 ++++++ dll/win32/comctl32/edit.c | 7 +++++++ dll/win32/comctl32/listbox.c | 13 +++++++++++++ dll/win32/comctl32/static.c | 7 +++++++ 7 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index b6c4f4e654..bc9336d705 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -2104,8 +2104,8 @@ void BUTTON_Register(void) #ifdef __REACTOS__ -void BUTTON_Unregister() +void BUTTON_Unregister(void) { UnregisterClassW(WC_BUTTONW, NULL); } -#endif \ No newline at end of file +#endif diff --git a/dll/win32/comctl32/combo.c b/dll/win32/comctl32/combo.c index 712e27276a..ee374f4537 100644 --- a/dll/win32/comctl32/combo.c +++ b/dll/win32/comctl32/combo.c @@ -2158,3 +2158,10 @@ void COMBO_Register(void) wndClass.lpszClassName = WC_COMBOBOXW; RegisterClassW(&wndClass); } + +#ifdef __REACTOS__ +void COMBO_Unregister(void) +{ + UnregisterClassW(WC_COMBOBOXW, NULL); +} +#endif diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index 2ced440b75..c529a96bb1 100644 --- a/dll/win32/comctl32/comctl32.h +++ b/dll/win32/comctl32/comctl32.h @@ -270,7 +270,12 @@ extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN; extern void UPDOWN_Register(void) DECLSPEC_HIDDEN; extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; #ifdef __REACTOS__ -extern void BUTTON_Unregister(); +extern void BUTTON_Unregister(void) DECLSPEC_HIDDEN; +extern void COMBO_Unregister(void) DECLSPEC_HIDDEN; +extern void COMBOLBOX_Unregister(void) DECLSPEC_HIDDEN; +extern void EDIT_Unregister(void) DECLSPEC_HIDDEN; +extern void LISTBOX_Unregister(void) DECLSPEC_HIDDEN; +extern void STATIC_Unregister(void) DECLSPEC_HIDDEN; extern void TOOLBARv6_Register(void) DECLSPEC_HIDDEN; extern void TOOLBARv6_Unregister(void) DECLSPEC_HIDDEN; #endif /* __REACTOS__ */ diff --git a/dll/win32/comctl32/commctrl.c b/dll/win32/comctl32/commctrl.c index 6eedf01810..d4cb73ae76 100644 --- a/dll/win32/comctl32/commctrl.c +++ b/dll/win32/comctl32/commctrl.c @@ -231,6 +231,12 @@ static void UnregisterControls(BOOL bV6) else { BUTTON_Unregister(); + COMBO_Unregister (); + COMBOLBOX_Unregister (); + EDIT_Unregister (); + LISTBOX_Unregister (); + STATIC_Unregister (); + TOOLBARv6_Unregister (); } diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index dde7d3e4c5..e2f47d008e 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -5039,3 +5039,10 @@ void EDIT_Register(void) wndClass.lpszClassName = WC_EDITW; RegisterClassW(&wndClass); } + +#ifdef __REACTOS__ +void EDIT_Unregister(void) +{ + UnregisterClassW(WC_EDITW, NULL); +} +#endif diff --git a/dll/win32/comctl32/listbox.c b/dll/win32/comctl32/listbox.c index 7857aa8174..897f2dc2c6 100644 --- a/dll/win32/comctl32/listbox.c +++ b/dll/win32/comctl32/listbox.c @@ -3081,3 +3081,16 @@ void COMBOLBOX_Register(void) wndClass.lpszClassName = combolboxW; RegisterClassW(&wndClass); } + +#ifdef __REACTOS__ +void LISTBOX_Unregister(void) +{ + UnregisterClassW(WC_LISTBOXW, NULL); +} + +void COMBOLBOX_Unregister(void) +{ + static const WCHAR combolboxW[] = {'C','o','m','b','o','L','B','o','x',0}; + UnregisterClassW(combolboxW, NULL); +} +#endif diff --git a/dll/win32/comctl32/static.c b/dll/win32/comctl32/static.c index d9e2fe30dc..f136f2cc79 100644 --- a/dll/win32/comctl32/static.c +++ b/dll/win32/comctl32/static.c @@ -791,3 +791,10 @@ void STATIC_Register(void) wndClass.lpszClassName = WC_STATICW; RegisterClassW(&wndClass); } + +#ifdef __REACTOS__ +void STATIC_Unregister(void) +{ + UnregisterClassW(WC_STATICW, NULL); +} +#endif

6 years, 3 months

01/01: [MAGNIFY] Fix the magnification ratio bug for CORE-14946 (#823)

by LuRenJia

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85bbd69caee7087f93e88… commit 85bbd69caee7087f93e88ed81c7f18fa3dac48d1 Author: LuRenJia <loli(a)lurenjia.in> AuthorDate: Mon Aug 27 20:36:28 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 27 14:36:28 2018 +0200 [MAGNIFY] Fix the magnification ratio bug for CORE-14946 (#823) This bug was caused by leaving the magnify window unrefreshed when updating the "Magnification Level" ComboBox. CORE-14946 --- base/applications/magnify/magnifier.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/base/applications/magnify/magnifier.c b/base/applications/magnify/magnifier.c index 057942eda2..f8d63cfce4 100644 --- a/base/applications/magnify/magnifier.c +++ b/base/applications/magnify/magnifier.c @@ -18,6 +18,8 @@ #include <winnls.h> #include <shellapi.h> #include <windowsx.h> +#include <stdlib.h> +#include <tchar.h> #include "resource.h" @@ -923,9 +925,15 @@ INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar if (HIWORD(wParam) == CBN_SELCHANGE) { HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); + LPCTSTR currentZoomValue = TEXT(""); /* Get index of current selection and the text of that selection */ - iZoom = SendMessage( hCombo, CB_GETCURSEL, (WPARAM) wParam, (LPARAM) lParam ) + 1; + int currentSelectionIndex = ComboBox_GetCurSel(hCombo); + ComboBox_GetLBText(hCombo, currentSelectionIndex, currentZoomValue); + iZoom = _ttoi(currentZoomValue); + + /* Trigger the Draw function to rezoom (which will be set false automatically after rezooming) */ + bRecreateOffscreenDC = TRUE; /* Update the magnifier UI */ Refresh();

6 years, 3 months

01/01: [SHELL32] Adjust the IDC_PICKICON_LIST control's height in the IDD_PICK_ICON dialog resource. (#824)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39dc3cdaf6dbd5bbb9187… commit 39dc3cdaf6dbd5bbb9187f5b407300be1a9803a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 27 19:21:51 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 27 12:21:51 2018 +0200 [SHELL32] Adjust the IDC_PICKICON_LIST control's height in the IDD_PICK_ICON dialog resource. (#824) CORE-14974 --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f70ab51e7a..d92e908455 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -623,7 +623,7 @@ BEGIN PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 81, 179, 50, 14 PUSHBUTTON "Отказ", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 631f92e38b..70c550ec67 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index f40ac4d79f..9dd457b67b 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -628,7 +628,7 @@ BEGIN PUSHBUTTON "Procházet...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Vyberte ikonu z následujícího seznamu:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 3bc9b897f3..4aaf1f3997 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -628,7 +628,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index efc3634c4d..c5051027dd 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL LTEXT "Wählen Sie ein Symbol aus der folgenden Liste:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index e7f3bb9b17..9fad4f6752 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 66ec04a577..7580deaa7a 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c62767bc5f..0af93f1f2c 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -623,7 +623,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 1de25b0d0a..a9af601531 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -630,7 +630,7 @@ BEGIN PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Seleccione un ícono de la siguiente lista:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index d1e2d597b3..e55068ef9d 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -630,7 +630,7 @@ BEGIN PUSHBUTTON "Sirvi...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Vali ikoon alltoodud loendist:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Loobu", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 9db340a980..c26f324d1c 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index a92417e480..d3de987465 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index a0c0a2d5a5..8904340619 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 26c17e4249..41f67c32a7 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 7690a98032..a86e349621 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 2a11288591..dd7b0a7e14 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "参照...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "以下のリストからアイコンを選択:", -1, 7, 36, 185, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 18ca34beb4..fa24d55a30 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index b53241383b..387541fa42 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index e12f930fee..5f70d98772 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 7ad2a5dfb8..88de63aeed 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -628,7 +628,7 @@ BEGIN PUSHBUTTON "Przeglądaj...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Wybierz ikonę z poniższej listy:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 1010c01b45..fd9d8bfa82 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index f197bc452f..67787e74fa 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 8d274abb87..826f112ec0 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -624,7 +624,7 @@ BEGIN PUSHBUTTON "Spe&cificare…", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Selectați o pictogramă din lista de mai jos:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 81, 179, 50, 14 PUSHBUTTON "A&nulează", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 803162e3d7..b34cf139a3 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -629,7 +629,7 @@ BEGIN PUSHBUTTON "Обзор...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Выберите значок из списка ниже:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index d9dc4a0f2b..345315be8f 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "&Prehľadávať...", IDC_BUTTON_PATH, 128, 17, 57, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 117, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index bd3664253f..0d9f4c8f43 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 52fa9e0a55..0ff880ccb5 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -626,7 +626,7 @@ BEGIN PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e6984f3a39..7eff83fef4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "Bläddra...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 3776274f38..a518658853 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -624,7 +624,7 @@ BEGIN PUSHBUTTON "Göz At...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Aşağıdaki dizelgeden bir simge seç:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 81, 179, 50, 14 PUSHBUTTON "İptal", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 171af9fe25..96fd94e59c 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -622,7 +622,7 @@ BEGIN PUSHBUTTON "О&гляд...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Скасувати", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 6c8312cf0a..8b732b6a4d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -632,7 +632,7 @@ BEGIN PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "从以下列表选择一个图标:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 81, 179, 50, 14 PUSHBUTTON "取消", IDCANCEL, 135, 179, 50, 14 END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 1a3c041db1..bdb8fe1e20 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -630,7 +630,7 @@ BEGIN PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 - LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 122, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END

6 years, 3 months

02/02: [SHELL32] Check the result from PathUnExpandEnvStringsW

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19e9a441183d907540bb2… commit 19e9a441183d907540bb22f8711db281334467b9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 26 22:38:27 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 27 11:58:29 2018 +0200 [SHELL32] Check the result from PathUnExpandEnvStringsW --- dll/win32/shell32/CShellLink.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 2b6b20020d..5afc4b715e 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -1856,6 +1856,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i { HRESULT hr = E_FAIL; WCHAR szUnExpIconPath[MAX_PATH]; + BOOL bSuccess; TRACE("(%p)->(path=%s iicon=%u)\n", this, debugstr_w(pszIconPath), iIcon); @@ -1875,8 +1876,8 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i */ // FIXME: http://stackoverflow.com/questions/2976489/ishelllinkseticonlocation-transl… // if (PathFullyUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath))) - PathUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath)); - if (wcscmp(pszIconPath, szUnExpIconPath) != 0) + bSuccess = PathUnExpandEnvStringsW(pszIconPath, szUnExpIconPath, _countof(szUnExpIconPath)); + if (bSuccess && wcscmp(pszIconPath, szUnExpIconPath) != 0) { /* Unexpansion succeeded, so we need an icon environment block */ EXP_SZ_LINK buffer;

6 years, 3 months

01/02: [SHELL32] Remove some mostly dead code from CShellLink

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=608cb60e446e3cfe4d8c1… commit 608cb60e446e3cfe4d8c1989468cfb2fe02d7d0a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 26 22:37:49 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 27 11:58:24 2018 +0200 [SHELL32] Remove some mostly dead code from CShellLink --- dll/win32/shell32/CShellLink.cpp | 94 ++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 61 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 67da3ed848..2b6b20020d 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -349,14 +349,10 @@ HRESULT STDMETHODCALLTYPE CShellLink::Save(LPCOLESTR pszFileName, BOOL fRemember if (SUCCEEDED(hr)) { - if (pszFileName != m_sLinkPath) - { - if (m_sLinkPath) - HeapFree(GetProcessHeap(), 0, m_sLinkPath); - - m_sLinkPath = strdupW(pszFileName); - } + if (m_sLinkPath) + HeapFree(GetProcessHeap(), 0, m_sLinkPath); + m_sLinkPath = strdupW(pszFileName); m_bDirty = FALSE; } else @@ -1416,12 +1412,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) bSuccess = SHGetPathFromIDListW(m_pPidl, buffer); if (bSuccess && *buffer) { - if (buffer != m_sPath) - { - m_sPath = strdupW(buffer); - if (!m_sPath) - return E_OUTOFMEMORY; - } + m_sPath = strdupW(buffer); + if (!m_sPath) + return E_OUTOFMEMORY; m_bDirty = TRUE; } @@ -1434,12 +1427,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) // FIXME: Strange to do that here... if (!m_sIcoPath && m_sPath) { - if (m_sIcoPath != m_sPath) - { - m_sIcoPath = strdupW(m_sPath); - if (!m_sIcoPath) - return E_OUTOFMEMORY; - } + m_sIcoPath = strdupW(m_sPath); + if (!m_sIcoPath) + return E_OUTOFMEMORY; m_Header.nIconIndex = 0; @@ -1565,12 +1555,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetDescription(LPCWSTR pszName) HeapFree(GetProcessHeap(), 0, m_sDescription); if (pszName) { - if (m_sDescription != pszName) - { - m_sDescription = strdupW(pszName); - if (!m_sDescription) - return E_OUTOFMEMORY; - } + m_sDescription = strdupW(pszName); + if (!m_sDescription) + return E_OUTOFMEMORY; } else m_sDescription = NULL; @@ -1600,12 +1587,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetWorkingDirectory(LPCWSTR pszDir) HeapFree(GetProcessHeap(), 0, m_sWorkDir); if (pszDir) { - if (m_sWorkDir != pszDir) - { - m_sWorkDir = strdupW(pszDir); - if (!m_sWorkDir) - return E_OUTOFMEMORY; - } + m_sWorkDir = strdupW(pszDir); + if (!m_sWorkDir) + return E_OUTOFMEMORY; } else m_sWorkDir = NULL; @@ -1635,12 +1619,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCWSTR pszArgs) HeapFree(GetProcessHeap(), 0, m_sArgs); if (pszArgs) { - if (m_sArgs != pszArgs) - { - m_sArgs = strdupW(pszArgs); - if (!m_sArgs) - return E_OUTOFMEMORY; - } + m_sArgs = strdupW(pszArgs); + if (!m_sArgs) + return E_OUTOFMEMORY; } else m_sArgs = NULL; @@ -1675,12 +1656,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cc SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); - if (m_sIcoPath != szPath) - { - m_sIcoPath = strdupW(szPath); - if (!m_sIcoPath) - return E_OUTOFMEMORY; - } + m_sIcoPath = strdupW(szPath); + if (!m_sIcoPath) + return E_OUTOFMEMORY; m_Header.dwFlags |= SLDF_HAS_ICONLOCATION; @@ -1954,12 +1932,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i HeapFree(GetProcessHeap(), 0, m_sIcoPath); m_sIcoPath = NULL; - if (m_sIcoPath != pszIconPath) - { - m_sIcoPath = strdupW(pszIconPath); - if (!m_sIcoPath) - return E_OUTOFMEMORY; - } + m_sIcoPath = strdupW(pszIconPath); + if (!m_sIcoPath) + return E_OUTOFMEMORY; m_Header.dwFlags |= SLDF_HAS_ICONLOCATION; } @@ -1979,12 +1954,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD HeapFree(GetProcessHeap(), 0, m_sPathRel); if (pszPathRel) { - if (m_sPathRel != pszPathRel) - { - m_sPathRel = strdupW(pszPathRel); - if (!m_sPathRel) - return E_OUTOFMEMORY; - } + m_sPathRel = strdupW(pszPathRel); + if (!m_sPathRel) + return E_OUTOFMEMORY; } else m_sPathRel = NULL; @@ -2327,12 +2299,12 @@ HRESULT CShellLink::SetTargetFromPIDLOrPath(LPCITEMIDLIST pidl, LPCWSTR pszFile) /* Update the cached path (for link info) */ ShellLink_GetVolumeInfo(pszFile, &volume); - if (m_sPath != pszFile) - { - m_sPath = strdupW(pszFile); - if (!m_sPath) - return E_OUTOFMEMORY; - } + if (m_sPath) + HeapFree(GetProcessHeap(), 0, m_sPath); + + m_sPath = strdupW(pszFile); + if (!m_sPath) + return E_OUTOFMEMORY; m_bDirty = TRUE; return hr;

6 years, 3 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 August 2018