Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTUSER] Fix where linking newly created window is done (#4127)
by Katayama Hirofumi MZ 04 Dec '21

04 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f606fecb0d8c5d5aab11e… commit f606fecb0d8c5d5aab11e9ac5214e3b48429ed5f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 4 11:52:38 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 4 11:52:38 2021 +0900 [NTUSER] Fix where linking newly created window is done (#4127) Co-authored-by: I_Kill_Bugs <> CORE-12052 --- win32ss/user/ntuser/window.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index d7877395159..7d2a97f3584 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2190,14 +2190,9 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Window->rcClient = Window->rcWindow; - /* Link the window */ - if (NULL != ParentWindow) + if (Window->spwndNext || Window->spwndPrev) { - /* Link the window into the siblings list */ - if ((Cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) - IntLinkHwnd(Window, HWND_BOTTOM); - else - IntLinkHwnd(Window, hwndInsertAfter); + ERR("Window 0x%p has been linked too early!\n", Window); } if (!(Window->state2 & WNDS2_WIN31COMPAT)) @@ -2210,10 +2205,10 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, { if ( !IntIsTopLevelWindow(Window) ) { - if (pti != Window->spwndParent->head.pti) + if (pti != ParentWindow->head.pti) { //ERR("CreateWindow Parent in.\n"); - UserAttachThreadInput(pti, Window->spwndParent->head.pti, TRUE); + UserAttachThreadInput(pti, ParentWindow->head.pti, TRUE); } } } @@ -2226,6 +2221,16 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, goto cleanup; } + /* Link the window */ + if (ParentWindow != NULL) + { + /* Link the window into the siblings list */ + if ((Cs->style & (WS_CHILD | WS_MAXIMIZE)) == WS_CHILD) + IntLinkHwnd(Window, HWND_BOTTOM); + else + IntLinkHwnd(Window, hwndInsertAfter); + } + /* Send the WM_NCCALCSIZE message */ { // RECT rc;

1 0

[reactos] 01/01: [APITESTS][NTVDM][SPOOLSV] Add the missing ENABLE_EXPORTS property as these EXE targets have function exports.
by Hermès Bélusca-Maïto 04 Dec '21

04 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=957e566a236b75ba2547a… commit 957e566a236b75ba2547af6305a5edf59c5eca7a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 4 01:08:20 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 4 01:17:32 2021 +0100 [APITESTS][NTVDM][SPOOLSV] Add the missing ENABLE_EXPORTS property as these EXE targets have function exports. This became a requirement, following a previous CMake update. Otherwise the built EXEs would not export their intended functions. Addendum to commit d8e92b5a (see PR #1335) CORE-15406 [LOADCONFIG] The GCC rant had nothing to do with GCC, but everything with CMake... [SPOOLSV] Add the missing exported stubs. --- modules/rostests/apitests/loadconfig/CMakeLists.txt | 12 ++++++------ modules/rostests/apitests/ntdll/CMakeLists.txt | 5 +++++ modules/rostests/apitests/shell32/CMakeLists.txt | 5 +++++ sdk/cmake/CMakeMacros.cmake | 6 ++++-- subsystems/mvdm/ntvdm/CMakeLists.txt | 5 +++++ win32ss/printing/base/spoolsv/CMakeLists.txt | 13 +++++++++++-- 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/modules/rostests/apitests/loadconfig/CMakeLists.txt b/modules/rostests/apitests/loadconfig/CMakeLists.txt index d4327e5622d..ac40bc53bb4 100644 --- a/modules/rostests/apitests/loadconfig/CMakeLists.txt +++ b/modules/rostests/apitests/loadconfig/CMakeLists.txt @@ -7,16 +7,16 @@ list(APPEND SOURCE loadconfig.h) add_executable(loadconfig_apitest ${SOURCE} testlist.c ${CMAKE_CURRENT_BINARY_DIR}/loadconfig_apitest.def) -target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) -set_module_type(loadconfig_apitest win32cui) -add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) -#add_pch(loadconfig_apitest loadconfig.h SOURCE) -add_rostests_file(TARGET loadconfig_apitest) -# Tell GCC again that we are really interested in exporting symols (who would have figured that we want to use the .def we specified before?) set_target_properties(loadconfig_apitest PROPERTIES ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") +target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) +set_module_type(loadconfig_apitest win32cui) +add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) +#add_pch(loadconfig_apitest loadconfig.h SOURCE) +add_rostests_file(TARGET loadconfig_apitest) + fixup_load_config(loadconfig_apitest) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 1e69ecf4900..a50b1898a76 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -110,6 +110,11 @@ add_executable(ntdll_apitest testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def) +set_target_properties(ntdll_apitest + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 7a175032619..9ebf9404a2d 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -41,6 +41,11 @@ add_executable(shell32_apitest resource.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def) +set_target_properties(shell32_apitest + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB} cpprt atl_classes) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 7e4cb21cbe0..b72b40b3cd9 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -669,8 +669,10 @@ function(set_module_type MODULE TYPE) if(TYPE STREQUAL kernel) # Kernels are executables with exports - set_property(TARGET ${MODULE} PROPERTY ENABLE_EXPORTS TRUE) - set_target_properties(${MODULE} PROPERTIES DEFINE_SYMBOL "") + set_target_properties(${MODULE} + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") endif() if(${TYPE} STREQUAL win32ocx) diff --git a/subsystems/mvdm/ntvdm/CMakeLists.txt b/subsystems/mvdm/ntvdm/CMakeLists.txt index ff102d88576..aa01e0727d3 100644 --- a/subsystems/mvdm/ntvdm/CMakeLists.txt +++ b/subsystems/mvdm/ntvdm/CMakeLists.txt @@ -73,6 +73,11 @@ add_executable(ntvdm ntvdm.rc ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) +set_target_properties(ntvdm + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + add_pch(ntvdm ntvdm.h SOURCE) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486 ${PSEH_LIB}) diff --git a/win32ss/printing/base/spoolsv/CMakeLists.txt b/win32ss/printing/base/spoolsv/CMakeLists.txt index 1506f4d5dc3..6602eba9fab 100644 --- a/win32ss/printing/base/spoolsv/CMakeLists.txt +++ b/win32ss/printing/base/spoolsv/CMakeLists.txt @@ -22,9 +22,18 @@ list(APPEND SOURCE rpcstubs.c spoolfile.c xcv.c - ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c) + ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c + ${CMAKE_CURRENT_BINARY_DIR}/spoolsv_stubs.c) -add_executable(spoolsv ${SOURCE} spoolsv.rc) +add_executable(spoolsv + ${SOURCE} + spoolsv.rc + ${CMAKE_CURRENT_BINARY_DIR}/spoolsv.def) + +set_target_properties(spoolsv + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") if(USE_CLANG_CL) target_compile_options(spoolsv PRIVATE "-Wno-cast-calling-convention")

1 0

[reactos] 03/03: [NTVDM] Log explicitly calls to Long FileName support functions in DOS INT 21h. Use MAXDWORD instead of hardcoded values.
by Hermès Bélusca-Maïto 03 Dec '21

03 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=addf1e87fe643c412dc22… commit addf1e87fe643c412dc22f4fcb461410398e2f6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 3 23:15:03 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:24 2021 +0100 [NTVDM] Log explicitly calls to Long FileName support functions in DOS INT 21h. Use MAXDWORD instead of hardcoded values. --- subsystems/mvdm/ntvdm/dos/dos32krnl/device.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c index 71fbdcef1aa..881f67e47d3 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c @@ -378,7 +378,7 @@ PDOS_DEVICE_NODE DosCreateDeviceEx(WORD Attributes, PCHAR DeviceName, WORD Priva /* Fill the header with data */ DriverHeader = SEG_OFF_TO_PTR(Segment, 0); - DriverHeader->Link = 0xFFFFFFFF; + DriverHeader->Link = MAXDWORD; DriverHeader->DeviceAttributes = Attributes; DriverHeader->StrategyRoutine = sizeof(DOS_DRIVER); DriverHeader->InterruptRoutine = sizeof(DOS_DRIVER) + sizeof(StrategyRoutine); diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c index 641ab62ed93..6c94ade7e6d 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c @@ -1998,6 +1998,17 @@ VOID WINAPI DosInt21h(LPWORD Stack) break; } + /* Long FileName Support */ + case 0x71: + { + DPRINT1("INT 21h LFN Support, AH = %02Xh, AL = %02Xh NOT IMPLEMENTED!\n", + getAH(), getAL()); + + setAL(0); // Some functions expect AL to be 0 when it's not supported. + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + break; + } + /* Unsupported */ default: // Default: { @@ -2302,7 +2313,7 @@ BOOLEAN DosKRNLInitialize(VOID) SysVars->BootDrive = RtlUpcaseUnicodeChar(SharedUserData->NtSystemRoot[0]) - 'A' + 1; /* Initialize the NUL device driver */ - SysVars->NullDevice.Link = 0xFFFFFFFF; + SysVars->NullDevice.Link = MAXDWORD; SysVars->NullDevice.DeviceAttributes = DOS_DEVATTR_NUL | DOS_DEVATTR_CHARACTER; // Offset from within the DOS data segment SysVars->NullDevice.StrategyRoutine = DOS_DATA_OFFSET(NullDriverRoutine); @@ -2380,7 +2391,7 @@ BOOLEAN DosKRNLInitialize(VOID) /* Initialize the SFT */ Sft = (PDOS_SFT)FAR_POINTER(SysVars->FirstSft); - Sft->Link = 0xFFFFFFFF; + Sft->Link = MAXDWORD; Sft->NumDescriptors = DOS_SFT_SIZE; for (i = 0; i < Sft->NumDescriptors; i++)

1 0

[reactos] 02/03: [NTVDM] Improve DOS file search implementation. Addendum to commit 86ba2faa (r67619).
by Hermès Bélusca-Maïto 03 Dec '21

03 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81d5e650de7fb78efcaf6… commit 81d5e650de7fb78efcaf6b5e27e79a2618285709 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 3 22:20:21 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:23 2021 +0100 [NTVDM] Improve DOS file search implementation. Addendum to commit 86ba2faa (r67619). We get file matches when their attributes match and we can obtain a valid 8.3 file name. This last condition is of upmost importance. We cannot reliably use GetShortPathName() on the filename returned by FindFirstFile()/FindNextFile() because the result is uncertain (one either needs to build a full path before calling the function just to get the final short path form, or change the current working directory to the one where the search is being made, etc.) The Find*file() functions return anyway the short file. name (in the cAlternateFileName member) if the file does have such 8.3 filename and its real name (in cFileName) is longer. Otherwise, cFileName could already be *THE* short filename because it has the correct format for it. Check this latter case with RtlIsNameLegalDOS8Dot3() and use it if so. Otherwise this means the file has a long filename that cannot be converted to short filename format (because e.g. it is in a volume where short filenames are unavailable), and we skip such files: they wouldn't be accessible from DOS anyways. - Doxygen-document demFileFindFirst(), demFileFindNext() and associated flags and structures. Update their annotations. This fixes TurboC 2.x installation. --- subsystems/mvdm/ntvdm/dos/dem.c | 220 ++++++++++++++++++++++++------ subsystems/mvdm/ntvdm/dos/dem.h | 36 +++-- subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h | 15 +- 3 files changed, 213 insertions(+), 58 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dem.c b/subsystems/mvdm/ntvdm/dos/dem.c index dcb78174d06..728963b972f 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.c +++ b/subsystems/mvdm/ntvdm/dos/dem.c @@ -1406,95 +1406,225 @@ demFileDelete(IN LPCSTR FileName) return GetLastError(); } +/** + * @brief Helper for demFileFindFirst() and demFileFindNext(). + * Returns TRUE if a file matches the DOS attributes and has a 8.3 file name. + **/ +static BOOLEAN +dempIsFileMatch( + _Inout_ PWIN32_FIND_DATAA FindData, + _In_ WORD AttribMask, + _Out_ PCSTR* ShortName) +{ + /* Convert in place the attributes to DOS format */ + FindData->dwFileAttributes = NT_TO_DOS_FA(FindData->dwFileAttributes); + + /* Check the attributes */ + if ((FindData->dwFileAttributes & (FA_HIDDEN | FA_SYSTEM | FA_DIRECTORY)) + & ~AttribMask) + { + return FALSE; + } + + /* Check whether the file has a 8.3 file name */ + if (*FindData->cAlternateFileName) + { + /* Use the available one */ + *ShortName = FindData->cAlternateFileName; + return TRUE; + } + else + { + /* + * Verify whether the original long name is actually a valid + * 8.3 file name. Note that we cannot use GetShortPathName() + * since the latter works on full paths, that we do not always have. + */ + BOOLEAN IsNameLegal, SpacesInName; + WCHAR FileNameBufferU[_countof(FindData->cFileName) + 1]; + UNICODE_STRING FileNameU; + ANSI_STRING FileNameA; + + RtlInitAnsiString(&FileNameA, FindData->cFileName); + RtlInitEmptyUnicodeString(&FileNameU, FileNameBufferU, sizeof(FileNameBufferU)); + RtlAnsiStringToUnicodeString(&FileNameU, &FileNameA, FALSE); + + IsNameLegal = RtlIsNameLegalDOS8Dot3(&FileNameU, + NULL, // (lpOemName ? &AnsiName : NULL), + &SpacesInName); + + if (!IsNameLegal || SpacesInName) + { + /* This is an error situation */ + DPRINT1("'%.*s' is %s 8.3 filename %s spaces\n", + _countof(FindData->cFileName), FindData->cFileName, + (IsNameLegal ? "a valid" : "an invalid"), (SpacesInName ? "with" : "without")); + } + + if (IsNameLegal && !SpacesInName) + { + /* We can use the original name */ + *ShortName = FindData->cFileName; + return TRUE; + } + } + + DPRINT1("No short 8.3 filename available for '%.*s'\n", + _countof(FindData->cFileName), FindData->cFileName); + + return FALSE; +} + +/** + * @name demFileFindFirst + * Implementation of the DOS INT 21h, AH=4Eh "Find First File" function. + * + * Starts enumerating files that match the given file search specification + * and whose attributes are _at most_ those specified by the mask. This means + * in particular that "normal files", i.e. files with no attributes set, are + * always enumerated along those matching the requested attributes. + * + * @param[out] pFindFileData + * Pointer to the DTA (Disk Transfer Area) filled with FindFirst data block. + * + * @param[in] FileName + * File search specification (may include path and wildcards). + * + * @param[in] AttribMask + * Mask of file attributes. Includes files with a given attribute bit set + * if the corresponding bit is set to 1 in the mask. Excludes files with a + * given attribute bit set if the corresponding bit is set to 0 in the mask. + * Supported file attributes: + * FA_NORMAL 0x0000 + * FA_READONLY 0x0001 (ignored) + * FA_HIDDEN 0x0002 + * FA_SYSTEM 0x0004 + * FA_VOLID 0x0008 (not currently supported) + * FA_LABEL + * FA_DIRECTORY 0x0010 + * FA_ARCHIVE 0x0020 (ignored) + * FA_DEVICE 0x0040 (ignored) + * + * @return + * ERROR_SUCCESS on success (found match), or a last error (match not found). + * + * @see demFileFindNext() + **/ DWORD WINAPI -demFileFindFirst(OUT PVOID lpFindFileData, - IN LPCSTR FileName, - IN WORD AttribMask) +demFileFindFirst( + _Out_ PVOID pFindFileData, + _In_ PCSTR FileName, + _In_ WORD AttribMask) { - BOOLEAN Success = TRUE; - WIN32_FIND_DATAA FindData; + PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)pFindFileData; HANDLE SearchHandle; - PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; + WIN32_FIND_DATAA FindData; + PCSTR ShortName = NULL; + + /* Reset the private block fields */ + RtlZeroMemory(FindFileBlock, RTL_SIZEOF_THROUGH_FIELD(DOS_FIND_FILE_BLOCK, SearchHandle)); + + // TODO: Handle FA_VOLID for volume label. + if (AttribMask & FA_VOLID) + { + DPRINT1("demFileFindFirst: Volume label attribute is UNIMPLEMENTED!\n"); + AttribMask &= ~FA_VOLID; // Remove it for the time being... + } + + /* Filter out the ignored attributes */ + AttribMask &= ~(FA_DEVICE | FA_ARCHIVE | FA_READONLY); /* Start a search */ SearchHandle = FindFirstFileA(FileName, &FindData); - if (SearchHandle == INVALID_HANDLE_VALUE) return GetLastError(); + if (SearchHandle == INVALID_HANDLE_VALUE) + return GetLastError(); - do + /* Check the attributes and retry as long as we haven't found a matching file */ + while (!dempIsFileMatch(&FindData, AttribMask, &ShortName)) { - /* Check the attributes and retry as long as we haven't found a matching file */ - if (!((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~AttribMask)) + /* Continue searching. If we fail at some point, + * stop the search and return an error. */ + if (!FindNextFileA(SearchHandle, &FindData)) { - break; + FindClose(SearchHandle); + return GetLastError(); } } - while ((Success = FindNextFileA(SearchHandle, &FindData))); - - /* If we failed at some point, close the search and return an error */ - if (!Success) - { - FindClose(SearchHandle); - return GetLastError(); - } /* Fill the block */ FindFileBlock->DriveLetter = DosData->Sda.CurrentDrive + 'A'; + strncpy(FindFileBlock->Pattern, FileName, _countof(FindFileBlock->Pattern)); FindFileBlock->AttribMask = AttribMask; FindFileBlock->SearchHandle = SearchHandle; FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); FileTimeToDosDateTime(&FindData.ftLastWriteTime, &FindFileBlock->FileDate, &FindFileBlock->FileTime); - FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + FindFileBlock->FileSize = FindData.nFileSizeHigh ? MAXDWORD : FindData.nFileSizeLow; - /* Build a short path name */ - if (*FindData.cAlternateFileName) - strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); - else - GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); + + /* Copy the NULL-terminated short file name */ + RtlStringCchCopyA(FindFileBlock->FileName, + _countof(FindFileBlock->FileName), + ShortName); return ERROR_SUCCESS; } +/** + * @name demFileFindNext + * Implementation of the DOS INT 21h, AH=4Fh "Find Next File" function. + * + * Continues enumerating files, with the same file search specification + * and attributes as those given to the first demFileFindFirst() call. + * + * @param[in,out] pFindFileData + * Pointer to the DTA (Disk Transfer Area) filled with FindFirst data block. + * + * @return + * ERROR_SUCCESS on success (found match), or a last error (match not found). + * + * @see demFileFindFirst() + **/ DWORD WINAPI -demFileFindNext(OUT PVOID lpFindFileData) +demFileFindNext( + _Inout_ PVOID pFindFileData) { + PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)pFindFileData; + HANDLE SearchHandle = FindFileBlock->SearchHandle; WIN32_FIND_DATAA FindData; - PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; + PCSTR ShortName = NULL; do { - /* Continue searching as long as we haven't found a matching file */ - - /* If we failed at some point, close the search and return an error */ - if (!FindNextFileA(FindFileBlock->SearchHandle, &FindData)) + /* Continue searching. If we fail at some point, + * stop the search and return an error. */ + if (!FindNextFileA(SearchHandle, &FindData)) { - FindClose(FindFileBlock->SearchHandle); + FindClose(SearchHandle); + + /* Reset the private block fields */ + RtlZeroMemory(FindFileBlock, RTL_SIZEOF_THROUGH_FIELD(DOS_FIND_FILE_BLOCK, SearchHandle)); return GetLastError(); } } - while ((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~FindFileBlock->AttribMask); + /* Check the attributes and retry as long as we haven't found a matching file */ + while (!dempIsFileMatch(&FindData, FindFileBlock->AttribMask, &ShortName)); /* Update the block */ FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); FileTimeToDosDateTime(&FindData.ftLastWriteTime, &FindFileBlock->FileDate, &FindFileBlock->FileTime); - FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + FindFileBlock->FileSize = FindData.nFileSizeHigh ? MAXDWORD : FindData.nFileSizeLow; - /* Build a short path name */ - if (*FindData.cAlternateFileName) - strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); - else - GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); + + /* Copy the NULL-terminated short file name */ + RtlStringCchCopyA(FindFileBlock->FileName, + _countof(FindFileBlock->FileName), + ShortName); return ERROR_SUCCESS; } diff --git a/subsystems/mvdm/ntvdm/dos/dem.h b/subsystems/mvdm/ntvdm/dos/dem.h index 8760e0468fb..789d2317d4a 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.h +++ b/subsystems/mvdm/ntvdm/dos/dem.h @@ -15,6 +15,7 @@ /* INCLUDES *******************************************************************/ +#include <crt/dos.h> // For _A_NORMAL etc. #include "dos32krnl/dos.h" /* DEFINES ********************************************************************/ @@ -62,21 +63,36 @@ demFileDelete IN LPCSTR FileName ); +/** + * @brief File attributes for demFileFindFirst(). + **/ +#define FA_NORMAL _A_NORMAL // 0x0000 +#define FA_READONLY _A_RDONLY // 0x0001 // FILE_ATTRIBUTE_READONLY +#define FA_HIDDEN _A_HIDDEN // 0x0002 // FILE_ATTRIBUTE_HIDDEN +#define FA_SYSTEM _A_SYSTEM // 0x0004 // FILE_ATTRIBUTE_SYSTEM +#define FA_VOLID _A_VOLID // 0x0008 +#define FA_LABEL FA_VOLID +#define FA_DIRECTORY _A_SUBDIR // 0x0010 // FILE_ATTRIBUTE_DIRECTORY +#define FA_ARCHIVE _A_ARCH // 0x0020 // FILE_ATTRIBUTE_ARCHIVE +#define FA_DEVICE 0x0040 // FILE_ATTRIBUTE_DEVICE + +#define FA_VALID (FA_ARCHIVE | FA_DIRECTORY | FA_SYSTEM | FA_HIDDEN | FA_READONLY | FA_NORMAL) + +/** @brief Convert Win32/NT file attributes to DOS format. */ +#define NT_TO_DOS_FA(Attrs) \ + ( ((Attrs) == FILE_ATTRIBUTE_NORMAL) ? FA_NORMAL : (LOBYTE(Attrs) & FA_VALID) ) + DWORD WINAPI -demFileFindFirst -( - OUT PVOID lpFindFileData, - IN LPCSTR FileName, - IN WORD AttribMask -); +demFileFindFirst( + _Out_ PVOID pFindFileData, + _In_ PCSTR FileName, + _In_ WORD AttribMask); DWORD WINAPI -demFileFindNext -( - OUT PVOID lpFindFileData -); +demFileFindNext( + _Inout_ PVOID pFindFileData); UCHAR WINAPI diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h index 18e50077d4a..6eb7067c388 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h @@ -119,20 +119,29 @@ typedef struct _DOS_INPUT_BUFFER CHAR Buffer[ANYSIZE_ARRAY]; } DOS_INPUT_BUFFER, *PDOS_INPUT_BUFFER; +/** + * @struct DOS_FIND_FILE_BLOCK + * Data block returned in the DTA (Disk Transfer Area) by the + * INT 21h, AH=4Eh "Find First File" and the INT 21h, AH=4Fh "Find Next File" + * functions. + * + * @see demFileFindFirst(), demFileFindNext() + **/ typedef struct _DOS_FIND_FILE_BLOCK { + /* The 21 first bytes (0x00 to 0x14 included) are reserved */ CHAR DriveLetter; CHAR Pattern[11]; UCHAR AttribMask; - DWORD Unused; - HANDLE SearchHandle; + DWORD Unused; // FIXME: We must NOT store a Win32 handle here! + HANDLE SearchHandle; // Instead we should use an ID and helpers to map it to Win32. /* The following part of the structure is documented */ UCHAR Attributes; WORD FileTime; WORD FileDate; DWORD FileSize; - CHAR FileName[13]; + _Null_terminated_ CHAR FileName[13]; } DOS_FIND_FILE_BLOCK, *PDOS_FIND_FILE_BLOCK; // http://www.ctyme.com/intr/rb-3023.htm

1 0

[reactos] 01/03: [NTVDM] Trivial english typos fixes.
by Hermès Bélusca-Maïto 03 Dec '21

03 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcbdab00373827cb6fac0… commit fcbdab00373827cb6fac08d799e3e8ffce3ab0be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 2 20:26:56 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:22 2021 +0100 [NTVDM] Trivial english typos fixes. --- subsystems/mvdm/ntvdm/bios/vidbios.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/bios/vidbios.c b/subsystems/mvdm/ntvdm/bios/vidbios.c index f580f3fb834..7a6611cc262 100644 --- a/subsystems/mvdm/ntvdm/bios/vidbios.c +++ b/subsystems/mvdm/ntvdm/bios/vidbios.c @@ -2357,7 +2357,7 @@ static VOID VidBiosSetCursorShape(WORD CursorStartEnd) * https://sites.google.com/site/pcdosretro/biosdata * * A proof that it is OK is that in the following code samples it is - * explicitely mentioned that setting bit 0 disables cursor emulation: + * explicitly mentioned that setting bit 0 disables cursor emulation: * - Code snippets in PC Magazine vol.5 num.15 of 16/09/1986, p.291-292; * - CardFile DOS utility (Jeff Prosise, PC Magazine vol.6 num.17 of 13/10/1987, p.403-416): * https://ia600700.us.archive.org/1/items/srccode-00000020/cardfile.asm.txt diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c index f07c87658af..86e17c86750 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c @@ -435,7 +435,7 @@ static VOID WINAPI XmsBopProcedure(LPWORD Stack) break; } - // NOTE: We implicitely suppose that we always have HMA. + // NOTE: We implicitly suppose that we always have HMA. // If not, we should fail there with the XMS_STATUS_HMA_DOES_NOT_EXIST // error code. diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c index a66cf1656d7..2db4059ac55 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c @@ -673,7 +673,7 @@ DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType, /* * Keep critical flags, clear test flags (OF, SF, ZF, AF, PF, CF) - * and explicitely set the interrupt flag. + * and explicitly set the interrupt flag. */ setEFLAGS((getEFLAGS() & ~0x08D5) | 0x0200);

1 0

[reactos] 01/01: [FREELDR] debug.h: Add an explicit VOID parameter type (#4133)
by Serge Gautherie 03 Dec '21

03 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30010a5aa750b64528ebb… commit 30010a5aa750b64528ebb2dca85ecfd7c3484f13 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Dec 3 03:14:44 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 3 03:14:44 2021 +0100 [FREELDR] debug.h: Add an explicit VOID parameter type (#4133) Addendum to 98c17d3. --- boot/freeldr/freeldr/include/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 247b8840647..e85582f8cea 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -44,7 +44,7 @@ ULONG DbgPrint(const char *Format, ...); VOID DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); - VOID DebugDisableScreenPort(); + VOID DebugDisableScreenPort(VOID); VOID DbgParseDebugChannels(PCHAR Value); #define ERR_LEVEL 0x1

1 0

[reactos] 01/01: [TRANSLATION][WORDPAD] Translate Wordpad to Croatian (#4098)
by Andrej Bartulin 02 Dec '21

02 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52c75521a6093e5358de4… commit 52c75521a6093e5358de44c7333cdb27b3955347 Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Thu Dec 2 20:08:45 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 20:08:45 2021 +0100 [TRANSLATION][WORDPAD] Translate Wordpad to Croatian (#4098) --- base/applications/wordpad/lang/hr-HR.rc | 258 ++++++++++++++++++++++++++++++++ base/applications/wordpad/rsrc.rc | 3 + 2 files changed, 261 insertions(+) diff --git a/base/applications/wordpad/lang/hr-HR.rc b/base/applications/wordpad/lang/hr-HR.rc new file mode 100644 index 00000000000..86bdfeba1e7 --- /dev/null +++ b/base/applications/wordpad/lang/hr-HR.rc @@ -0,0 +1,258 @@ +/* This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU +BEGIN + POPUP "&Datoteka" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Otvori...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Spremi\tCtrl+S", ID_FILE_SAVE + MENUITEM "Spremi &kao...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Ispiši...\tCtrl+P", ID_PRINT + MENUITEM "Ispiši &pregled", ID_PREVIEW + MENUITEM "Postavljanje stranic&e", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Iz&ađi", ID_FILE_EXIT + END + POPUP "&Uredi" + BEGIN + MENUITEM "&Poništi\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Vrati\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Izreži\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiraj\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Zalijepi\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Iz&briši\tDel", ID_EDIT_CLEAR + MENUITEM "&Označi sve\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "P&ronađi...\tCtrl+F", ID_FIND + MENUITEM "Pronađi &slijedeće\tF3", ID_FIND_NEXT + MENUITEM "Z&amijeni...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Pročitaj-samo &način", ID_EDIT_READONLY + MENUITEM "&Modificirano", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Dodatno" + BEGIN + MENUITEM "&Informacije označenoga", ID_EDIT_SELECTIONINFO + MENUITEM "&Format znaka", ID_EDIT_CHARFORMAT + MENUITEM "&Definicija znakovnog formata", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Paragraf formata", ID_EDIT_PARAFORMAT + MENUITEM "Dobij &tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Pogled" + BEGIN + MENUITEM "&Alatna traka", ID_TOGGLE_TOOLBAR + MENUITEM "Traka &formatiranja", ID_TOGGLE_FORMATBAR + MENUITEM "&Ravnalo", ID_TOGGLE_RULER + MENUITEM "&Statusna traka", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opcije...", ID_VIEWPROPERTIES + END + POPUP "&Ubaci" + BEGIN + MENUITEM "&Datum i vrijeme...", ID_DATETIME + END + POPUP "&Format" + BEGIN + MENUITEM "&Font...", ID_FONTSETTINGS + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + MENUITEM "&Kartice...", ID_TABSTOPS + POPUP "&Pozadina" + BEGIN + MENUITEM "&Sustav\tCtrl+1", ID_BACK_1 + MENUITEM "&Bijelo žuta\tCtrl+2", ID_BACK_2 + END + END + POPUP "P&omoć" + BEGIN + MENUITEM "&O Wine WordPad-u", ID_ABOUT + END +END + +IDM_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Izreži", ID_EDIT_CUT + MENUITEM "&Kopiraj", ID_EDIT_COPY + MENUITEM "&Zalijepi", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + END +END + +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Crna", ID_COLOR_BLACK + MENUITEM "Boja kestena", ID_COLOR_MAROON + MENUITEM "Zelena", ID_COLOR_GREEN + MENUITEM "Boja masline", ID_COLOR_OLIVE + MENUITEM "Mornarska boja", ID_COLOR_NAVY + MENUITEM "Ljubičasta", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Siva", ID_COLOR_GRAY + MENUITEM "Srebrna", ID_COLOR_SILVER + MENUITEM "Crvena", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Žuta", ID_COLOR_YELLOW + MENUITEM "Plava", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "Bijela", ID_COLOR_WHITE + MENUITEM "Automatski", ID_COLOR_AUTOMATIC + END +END + +STRINGTABLE +BEGIN + STRING_ALL_FILES, "Svi dokumenti (*.*)" + STRING_TEXT_FILES_TXT, "Tekstni dokumenti (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekstni dokumenti (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Obogaćeni tekstni formati (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Obogaćeni tekstni dokument" + STRING_NEWFILE_TXT, "Tekstni dokument" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekstni dokument" + STRING_PRINTER_FILES_PRN, "Datoteke ispisa (*.prn)" +END + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "Lijevo" + STRING_ALIGN_RIGHT, "Desno" + STRING_ALIGN_CENTER, "Sredina" +END + +STRINGTABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opcije" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Obogaćeni teskt" +END + +STRINGTABLE +BEGIN + STRING_PREVIEW_PRINT, "Ispis" + STRING_PREVIEW_NEXTPAGE, "Sljedeća stranica" + STRING_PREVIEW_PREVPAGE, "Prethodna stranica" + STRING_PREVIEW_TWOPAGES, "Dvije stranice" + STRING_PREVIEW_ONEPAGE, "Jedna stranica" + STRING_PREVIEW_ZOOMIN, "Zumiraj" + STRING_PREVIEW_ZOOMOUT, "Odzumiraj" + STRING_PREVIEW_CLOSE, "Zatvori" + STRING_PREVIEW_PAGE, "Stranica" + STRING_PREVIEW_PAGES, "Stranice" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch (inči)" + STRING_UNITS_PT, "pt" +END + +STRINGTABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Spremi promjene u '%s'?" + STRING_SEARCH_FINISHED, "Završeno pretraživanje dokumenta." + STRING_LOAD_RICHED_FAILED, "Neuspješno učitavanje RichEdit knjižnice." + STRING_SAVE_LOSEFORMATTING, "Odabrali ste spremanje u formatu običnog teksta, što će uzrokovati gubitak cjelokupnog oblikovanja. Jeste li sigurni da to želite učiniti?" + STRING_INVALID_NUMBER, "Nevažeći format brojeva." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE dokumenti za pohranu nisu podržani." + STRING_WRITE_FAILED, "Neuspješno spremanje dokumenta." + STRING_WRITE_ACCESS_DENIED, "Nemate dopuštenje za spremanje datoteke." + STRING_OPEN_FAILED, "Neuspješno otvaranje datoteke." + STRING_OPEN_ACCESS_DENIED, "Nemate dopuštenje za otvaranje datoteke." + STRING_PRINTING_NOT_IMPLEMENTED, "Ispis nije implementiran, razvijen." + STRING_MAX_TAB_STOPS, "Ne može se dodati više od 32 tabulatora." +END + +IDD_DATETIME DIALOGEX 30, 20, 130, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Date and time" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Podražni formati",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + DEFPUSHBUTTON "U redu",IDOK,87,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOGEX 30, 20, 140, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Novo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Novi tip dokumenta",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + DEFPUSHBUTTON "U redu",IDOK,97,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Format paragrafa" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Uvlačenje", -1, 10, 10, 140, 68 + LTEXT "Lijevo", -1, 15, 22, 60, 13 + EDITTEXT IDC_PARA_LEFT, 75, 20, 65, 13 + LTEXT "Desno", -1, 15, 40, 60, 13 + EDITTEXT IDC_PARA_RIGHT, 75, 38, 65, 13 + LTEXT "Prva linija", -1, 15, 58, 60, 13 + EDITTEXT IDC_PARA_FIRST, 75, 56, 65, 13 + LTEXT "Poravnanje", -1, 15, 87, 60, 13 + COMBOBOX IDC_PARA_ALIGN, 75, 85, 65, 60, CBS_DROPDOWNLIST + DEFPUSHBUTTON "U redu", IDOK, 160, 15, 50, 15 + PUSHBUTTON "Odustani", IDCANCEL, 160, 33, 50, 15 +END + +IDD_TABSTOPS DIALOGEX 30, 20, 200, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tabulatori" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tabulatori", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Ukloni", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "U redu", IDOK, 135, 15, 58, 15 + PUSHBUTTON "Odustani", IDCANCEL, 135, 33, 58, 15 + PUSHBUTTON "Ukloni &sve", ID_TAB_EMPTY, 135, 51, 58, 15 +END + +IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110 +STYLE DS_SHELLFONT | DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Omatanje linija", -1, 5, 10, 145, 85 + RADIOBUTTON "&Nema prelamanja linija", IDC_PAGEFMT_WN, 10, 25, 138, 15 + RADIOBUTTON "Prelomi tekst uz &okvir prozora", IDC_PAGEFMT_WW, 10, 45, 138, 15 + RADIOBUTTON "Prelamanje teksta uz &marginu", IDC_PAGEFMT_WM, 10, 65, 138, 15 + GROUPBOX "Alatne trake", -1, 155, 10, 115, 85 + CHECKBOX "&Alatna traka", IDC_PAGEFMT_TB, 165, 20, 80, 15 + CHECKBOX "&Formatna traka", IDC_PAGEFMT_FB, 165, 38, 80, 15 + CHECKBOX "&Ravnalo", IDC_PAGEFMT_RU, 165, 56, 80, 15 + CHECKBOX "&Statusna traka", IDC_PAGEFMT_SB, 165, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END diff --git a/base/applications/wordpad/rsrc.rc b/base/applications/wordpad/rsrc.rc index d4e0f7f3a7a..42bd9eb4d31 100644 --- a/base/applications/wordpad/rsrc.rc +++ b/base/applications/wordpad/rsrc.rc @@ -93,6 +93,9 @@ IDC_ZOOM CURSOR "res/zoom.cur" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

[reactos] 01/01: [USETUP] Improve pt-Pt Translation (#4130)
by Jose Carlos Jesus 02 Dec '21

02 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a3af90d708e6516ee489… commit 6a3af90d708e6516ee48963206eb83a6c808778c Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Dec 2 18:57:31 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 19:57:31 2021 +0100 [USETUP] Improve pt-Pt Translation (#4130) * Remove duplicate word * Improve pt-PT translation * Fix typos --- base/setup/usetup/lang/pt-PT.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 690e5cc3362..ab895a038de 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -734,7 +734,7 @@ static MUI_ENTRY ptPTFlushPageEntries[] = { 10, 6, - "O sistema est\240 a certificar que todos os dados est\306 a ser", + "O sistema est\240 a certificar que todos os dados est\306o a ser", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -949,7 +949,7 @@ static MUI_ENTRY ptPTBootPageEntries[] = { 6, 8, - "O instalador n\306o pode instalar o ger\210nciador de inicializa\207\306o no disco", + "O instalador n\306o pode instalar o gestor de inicializa\207\306o no disco", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1009,7 +1009,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = { 6, 8, - "n\306o-particionados neste computador.", + "n\306o particionados neste computador.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1493,35 +1493,35 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 6, 8, - "O instalador ir\240 configurar o ger\210nciador de inicializa\207\306o", + "O instalador ir\240 configurar o gestor de inicializa\207\306o", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "Instalar o ger\210nciador de inicializa\207\306o no disco r\241gido (MBR e VBR)", + "Instalar o gestor de inicializa\207\306o no disco r\241gido (MBR e VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "Instalar o ger\210nciador de inicializa\207\306o no disco r\241gido (apenas VBR)", + "Instalar o gestor de inicializa\207\306o no disco r\241gido (apenas VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 14, - "Instalar o ger\210nciador de inicializa\207\306o numa disquete", + "Instalar o gestor de inicializa\207\306o numa disquete", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "Saltar a instala\207\306o do ger\210nciador de inicializa\207\306o", + "Saltar a instala\207\306o do gestor de inicializa\207\306o", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1753,7 +1753,7 @@ static MUI_ENTRY ptPTSelectFSEntries[] = { 6, 18, - "sistema de arquivos de arquivos desejado e pressione ENTER.", + "sistema de arquivos desejado e pressione ENTER.", 0 }, { @@ -2306,7 +2306,7 @@ MUI_STRING ptPTStrings[] = {STRING_REBOOTPROGRESSBAR, " O computador ir\240 reiniciar em %li segundo(s)... "}, {STRING_CONSOLEFAIL1, - "N\306o foi poss\241vel abrir o console\r\n\r\n"}, + "N\306o foi poss\241vel abrir a consola\r\n\r\n"}, {STRING_CONSOLEFAIL2, "A causa mais com\243m \202 a utiliza\207\306o de um teclado USB\r\n"}, {STRING_CONSOLEFAIL3,

1 0

[reactos] 01/01: [3DTEXT] Fix 3dtext.scr using near 100% CPU (#4125)
by Doug Lyons 02 Dec '21

02 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c9fdcb1de7faa49c2af3… commit 5c9fdcb1de7faa49c2af341631217baa7b9fe552 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Dec 2 12:55:39 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 2 19:55:39 2021 +0100 [3DTEXT] Fix 3dtext.scr using near 100% CPU (#4125) CORE-17866, CORE-8217 --- base/applications/screensavers/3dtext/3dtext.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/base/applications/screensavers/3dtext/3dtext.c b/base/applications/screensavers/3dtext/3dtext.c index c1f908ca37a..b46fcce6905 100644 --- a/base/applications/screensavers/3dtext/3dtext.c +++ b/base/applications/screensavers/3dtext/3dtext.c @@ -41,6 +41,9 @@ GLfloat extentY = 0.0f; HINSTANCE hInstance; BOOL fullscreen = FALSE; +UINT uTimerID; // SetTimer Actual ID +#define APP_TIMER 1 // Graphics Update Timer ID +#define APP_TIMER_INTERVAL (USER_TIMER_MINIMUM * 5) // Graphics Update Interval // Build Our Bitmap Font GLvoid BuildFont(GLvoid) @@ -338,12 +341,18 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) // Initialize The GL Screen Using Screen Info InitGL(Screen.right, Screen.bottom); + + // Create Graphics update timer + uTimerID = SetTimer(hWnd, APP_TIMER, APP_TIMER_INTERVAL, NULL); break; case WM_DESTROY: // Disable Fullscreen Mode ChangeDisplaySettings(NULL, 0); + // Delete the Update Timer + KillTimer(hWnd, uTimerID); + // Deletes The Font Display List KillFont(); @@ -360,6 +369,8 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_PAINT: DrawGLScene(); SwapBuffers(hDC); + // Mark this window as updated, so the OS won't ask us to update it again. + ValidateRect(hWnd, NULL); break; case WM_SIZE: // Resizing The Screen @@ -367,6 +378,11 @@ ScreenSaverProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ReSizeGLScene(LOWORD(lParam), HIWORD(lParam)); break; + case WM_TIMER: + // Used to update graphic based on timer udpate interval + InvalidateRect(hWnd, NULL, TRUE); + break; + default: // Pass Windows Messages to the default screensaver window procedure return DefScreenSaverProc(hWnd, message, wParam, lParam);

1 0

[reactos] 01/01: [WIN32K:ENG] Pass correct display name to EngpFindGraphicsDevice (#4128)
by Oleg Dubinskiy 01 Dec '21

01 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c05a45e17eda057d8b92b… commit c05a45e17eda057d8b92ba76feecf3532d8324c1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Dec 1 15:28:45 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 1 18:28:45 2021 +0300 [WIN32K:ENG] Pass correct display name to EngpFindGraphicsDevice (#4128) It actually should look like '\\.\DISPLAY<n>' (since it comes from user mode), which the function expects, and not '\\Device\\Video<n>', like done in the kernel mode. Otherwise, passing wrong name causes a mismatch. Fix the problem with video device access (failure with status 0xc0000022 when trying to open it). Hence, it also fixes the following debug log spam: 'err: Could not open device \Device\Video0, 0xc0000022'. Addendum to 77e891b8. CORE-17719 CORE-17786 --- win32ss/gdi/eng/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 12fbcd0359b..2777143bf9f 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -36,7 +36,7 @@ NTSTATUS EngpUpdateGraphicsDeviceList(VOID) { ULONG iDevNum, iVGACompatible = -1, ulMaxObjectNumber = 0; - WCHAR awcDeviceName[20]; + WCHAR awcDeviceName[20], awcWinDeviceName[20]; UNICODE_STRING ustrDeviceName; WCHAR awcBuffer[256]; NTSTATUS Status; @@ -74,7 +74,10 @@ EngpUpdateGraphicsDeviceList(VOID) { /* Create the adapter's key name */ swprintf(awcDeviceName, L"\\Device\\Video%lu", iDevNum); - RtlInitUnicodeString(&ustrDeviceName, awcDeviceName); + + /* Create the display device name */ + swprintf(awcWinDeviceName, L"\\\\.\\DISPLAY%lu", iDevNum + 1); + RtlInitUnicodeString(&ustrDeviceName, awcWinDeviceName); /* Check if the device exists already */ pGraphicsDevice = EngpFindGraphicsDevice(&ustrDeviceName, iDevNum, 0);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs