Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [MSPAINT] Fix PushImageForUndo (follow-up of 7c0615f)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a65ebc8a71569a5c3da32… commit a65ebc8a71569a5c3da32fa046cea83902cec91f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:37:34 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:37:43 2023 +0900 [MSPAINT] Fix PushImageForUndo (follow-up of 7c0615f) CORE-19226, CORE-19237 --- base/applications/mspaint/history.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 6077b7c5c43..f56981a2bb6 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -130,11 +130,10 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - INT iNextItem = (m_currInd + 1) % HISTORYSIZE; - ::DeleteObject(m_hBms[iNextItem]); + ::DeleteObject(m_hBms[m_currInd]); m_hBms[m_currInd] = m_hbmMaster; m_hbmMaster = hbm; - m_currInd = iNextItem; + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select if (m_undoSteps < HISTORYSIZE - 1)

1 year, 1 month

[reactos] 01/01: [MSPAINT] Use Swap in RegistrySettings::SetMostRecentFile

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a58aee5f5b673e5e44985… commit a58aee5f5b673e5e44985df30d9ed892a216edf4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:23:13 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:23:13 2023 +0900 [MSPAINT] Use Swap in RegistrySettings::SetMostRecentFile CORE-19237 --- base/applications/mspaint/common.h | 2 +- base/applications/mspaint/registry.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index e15297e115b..7f640110806 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -51,7 +51,7 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); #define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) template <typename T> -void Swap(T& a, T& b) +inline void Swap(T& a, T& b) { T tmp = a; a = b; diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 68c54f5201c..6302555c41b 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -264,11 +264,7 @@ void RegistrySettings::SetMostRecentFile(LPCWSTR szPathName) iFound = i; if (iFound >= 0) - { - CStringW tmp = strFiles[i]; - strFiles[i] = strFiles[i - 1]; - strFiles[i - 1] = tmp; - } + Swap(strFiles[i], strFiles[i - 1]); } // If szPathName is not the first item in strFiles, insert it at the top of the list

1 year, 1 month

[reactos] 01/01: [MSPAINT] Split master image from history items

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c0615fa05762fa03600a… commit 7c0615fa05762fa03600a214b775d5adeb703e38 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 18 11:19:38 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 18 11:19:38 2023 +0900 [MSPAINT] Split master image from history items CORE-19237 --- base/applications/mspaint/common.h | 8 +++++ base/applications/mspaint/history.cpp | 65 +++++++++++++++++++---------------- base/applications/mspaint/history.h | 1 + 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 125a9cb53a6..e15297e115b 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -49,3 +49,11 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); #define DEG2RAD(degree) (((degree) * M_PI) / 180) #define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) + +template <typename T> +void Swap(T& a, T& b) +{ + T tmp = a; + a = b; + b = tmp; +} diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 9c0d18f5878..6077b7c5c43 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -32,21 +32,18 @@ ImageModel::ImageModel() { ZeroMemory(m_hBms, sizeof(m_hBms)); - m_hBms[0] = CreateColorDIB(1, 1, RGB(255, 255, 255)); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[0]); + m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255)); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); g_imageSaved = TRUE; } ImageModel::~ImageModel() { + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select ::DeleteDC(m_hDrawingDC); - - for (size_t i = 0; i < HISTORYSIZE; ++i) - { - if (m_hBms[i]) - ::DeleteObject(m_hBms[i]); - } + ::DeleteObject(m_hbmMaster); + ClearHistory(); } void ImageModel::Undo(BOOL bClearRedo) @@ -57,9 +54,13 @@ void ImageModel::Undo(BOOL bClearRedo) selectionModel.HideSelection(); - // Select previous item - m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; // Go previous + + ATLASSERT(m_hbmMaster != NULL); + ATLASSERT(m_hBms[m_currInd] != NULL); + + Swap(m_hbmMaster, m_hBms[m_currInd]); + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_undoSteps--; if (bClearRedo) @@ -78,9 +79,12 @@ void ImageModel::Redo() selectionModel.HideSelection(); - // Select next item - m_currInd = (m_currInd + 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + ATLASSERT(m_hbmMaster != NULL); + ATLASSERT(m_hBms[m_currInd] != NULL); + + Swap(m_hbmMaster, m_hBms[m_currInd]); + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_redoSteps--; if (m_undoSteps < HISTORYSIZE - 1) @@ -93,7 +97,7 @@ void ImageModel::ClearHistory() { for (int i = 0; i < HISTORYSIZE; ++i) { - if (m_hBms[i] && i != m_currInd) + if (m_hBms[i]) { ::DeleteObject(m_hBms[i]); m_hBms[i] = NULL; @@ -126,11 +130,12 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - // Go to the next item with an HBITMAP or current item - ::DeleteObject(m_hBms[(m_currInd + 1) % HISTORYSIZE]); - m_hBms[(m_currInd + 1) % HISTORYSIZE] = hbm; - m_currInd = (m_currInd + 1) % HISTORYSIZE; - ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); + INT iNextItem = (m_currInd + 1) % HISTORYSIZE; + ::DeleteObject(m_hBms[iNextItem]); + m_hBms[m_currInd] = m_hbmMaster; + m_hbmMaster = hbm; + m_currInd = iNextItem; + ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select if (m_undoSteps < HISTORYSIZE - 1) m_undoSteps++; @@ -181,7 +186,7 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) void ImageModel::SaveImage(LPCWSTR lpFileName) { - SaveDIBToFile(m_hBms[m_currInd], lpFileName, TRUE); + SaveDIBToFile(m_hbmMaster, lpFileName, TRUE); } BOOL ImageModel::IsImageSaved() const @@ -197,17 +202,17 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk INT newHeight = oldHeight * nStretchPercentY / 100; if (oldWidth != newWidth || oldHeight != newHeight) { - HBITMAP hbm0 = CopyDIBImage(m_hBms[m_currInd], newWidth, newHeight); + HBITMAP hbm0 = CopyDIBImage(m_hbmMaster, newWidth, newHeight); PushImageForUndo(hbm0); } if (nSkewDegX) { - HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegX, FALSE); + HBITMAP hbm1 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegX, FALSE); PushImageForUndo(hbm1); } if (nSkewDegY) { - HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hBms[m_currInd], nSkewDegY, TRUE); + HBITMAP hbm2 = SkewDIB(m_hDrawingDC, m_hbmMaster, nSkewDegY, TRUE); PushImageForUndo(hbm2); } NotifyImageChanged(); @@ -215,12 +220,12 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk int ImageModel::GetWidth() const { - return GetDIBWidth(m_hBms[m_currInd]); + return GetDIBWidth(m_hbmMaster); } int ImageModel::GetHeight() const { - return GetDIBHeight(m_hBms[m_currInd]); + return GetDIBHeight(m_hbmMaster); } void ImageModel::InvertColors() @@ -309,15 +314,15 @@ HBITMAP ImageModel::LockBitmap() { // NOTE: An app cannot select a bitmap into more than one device context at a time. ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP hbmLocked = m_hBms[m_currInd]; - m_hBms[m_currInd] = NULL; + HBITMAP hbmLocked = m_hbmMaster; + m_hbmMaster = NULL; return hbmLocked; } void ImageModel::UnlockBitmap(HBITMAP hbmLocked) { - m_hBms[m_currInd] = hbmLocked; - m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select + m_hbmMaster = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select } void ImageModel::SelectionClone(BOOL bUndoable) diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 14b5e38a582..e827a430b35 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -45,6 +45,7 @@ public: protected: HDC m_hDrawingDC; // The device context for this class + HBITMAP m_hbmMaster; // The master bitmap int m_currInd; // The current index in m_hBms int m_undoSteps; // The undo-able count int m_redoSteps; // The redo-able count

1 year, 1 month

[reactos] 01/01: [NTOS:CC] Do not access VACB after decrementing it's reference count

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf95b7e8e5e7544a5048e… commit bf95b7e8e5e7544a5048ed700fced44ba238d553 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 7 00:58:15 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 17 20:07:55 2023 +0200 [NTOS:CC] Do not access VACB after decrementing it's reference count It might already be deleted by a different thread. --- ntoskrnl/cc/view.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index efa4c8523d4..2a0590dba49 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -75,13 +75,16 @@ ULONG CcRosVacbIncRefCount_(PROS_VACB vacb, PCSTR file, INT line) ULONG CcRosVacbDecRefCount_(PROS_VACB vacb, PCSTR file, INT line) { ULONG Refs; + BOOLEAN VacbDirty = vacb->Dirty; + BOOLEAN VacbTrace = vacb->SharedCacheMap->Trace; + BOOLEAN VacbPageOut = vacb->PageOut; Refs = InterlockedDecrement((PLONG)&vacb->ReferenceCount); - ASSERT(!(Refs == 0 && vacb->Dirty)); - if (vacb->SharedCacheMap->Trace) + ASSERT(!(Refs == 0 && VacbDirty)); + if (VacbTrace) { DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n", - file, line, vacb, Refs, vacb->Dirty, vacb->PageOut); + file, line, vacb, Refs, VacbDirty, VacbPageOut); } if (Refs == 0)

1 year, 1 month

[reactos] 01/01: [INETCPL] Let image list be automatically deleted (#5892)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a063a2823f74b3e7511… commit a2a063a2823f74b3e751160c75049ca879c6bf22 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 17 10:11:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 17 10:11:41 2023 +0900 [INETCPL] Let image list be automatically deleted (#5892) Based on KRosUser's inetsec.patch. Don't delete the image list because the image list will be automatically deleted by the list view. CORE-19301 --- dll/cpl/inetcpl/security.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c index e11caf1fc3e..91c10765c76 100644 --- a/dll/cpl/inetcpl/security.c +++ b/dll/cpl/inetcpl/security.c @@ -275,10 +275,12 @@ static INT_PTR security_on_destroy(secdlg_data * sd) heap_free(sd->zone_attr); heap_free(sd->zones); +#ifndef __REACTOS__ if (sd->himages) { SendMessageW(sd->hlv, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); ImageList_Destroy(sd->himages); } +#endif security_cleanup_zones(sd); SetWindowLongPtrW(sd->hsec, DWLP_USER, 0);

1 year, 1 month

[reactos] 01/01: [BOOTDATA] LiveCD: Enable Toggle key (Alt+Shift etc.) (#5985)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8860dc5393ffffb1d2c9e… commit 8860dc5393ffffb1d2c9ebf2c0b33a12aeee1e48 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 17 07:23:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 22:23:11 2023 +0000 [BOOTDATA] LiveCD: Enable Toggle key (Alt+Shift etc.) (#5985) --- boot/bootdata/livecd.inf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 67ae5850138..a9202d068ce 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -10,6 +10,11 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" ; Default locale for the keyboard layout HKU,".DEFAULT\Keyboard Layout\Preload","1",0x00000000,"00000409" +; Toggle keys (Alt+Shift etc.) +HKU,".DEFAULT\Keyboard Layout\Toggle","Hotkey",0x00000000,"1" +HKU,".DEFAULT\Keyboard Layout\Toggle","Language Hotkey",0x00000000,"1" +HKU,".DEFAULT\Keyboard Layout\Toggle","Layout Hotkey",0x00000000,"2" + ; Cdrom class driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000000

1 year, 1 month

[reactos] 01/01: [SERVICES][SETUPLIB][UMANDLG][USETUP] Add missing \n to DPRINT() calls (#5983)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=780c2a0375cfc3e328f05… commit 780c2a0375cfc3e328f059cb7ea2a2e2d52a6626 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 16 23:22:12 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 22:22:12 2023 +0000 [SERVICES][SETUPLIB][UMANDLG][USETUP] Add missing \n to DPRINT() calls (#5983) And promote 1 DPRINT() to DPRINT1. --- base/applications/utilman/umandlg/process.c | 4 ++-- base/setup/lib/install.c | 2 +- base/setup/lib/setuplib.c | 4 ++-- base/setup/lib/utils/partlist.c | 2 +- base/setup/usetup/usetup.c | 10 +++++----- base/system/services/database.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/utilman/umandlg/process.c b/base/applications/utilman/umandlg/process.c index 33ceeac0b31..c1ff0c191e6 100644 --- a/base/applications/utilman/umandlg/process.c +++ b/base/applications/utilman/umandlg/process.c @@ -84,7 +84,7 @@ BOOL IsProcessRunning(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(SYNCHRONIZE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)", GetLastError()); + DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)\n", GetLastError()); return FALSE; } @@ -211,7 +211,7 @@ BOOL CloseProcess(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)", GetLastError()); + DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)\n", GetLastError()); return FALSE; } diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index a9a489bf8ce..46a36d2fa08 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -655,7 +655,7 @@ PrepareCopyInfFile( if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); pSetupData->LastErrorNumber = ERROR_CREATE_DIR; if (pSetupData->ErrorRoutine) pSetupData->ErrorRoutine(pSetupData, PathBuffer); diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 1ee70e6216a..40e8c13b36f 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -833,7 +833,7 @@ InitializeSetup( &pSetupData->SourceRootDir); if (!NT_SUCCESS(Status)) { - DPRINT1("GetSourcePaths() failed (Status 0x%08lx)", Status); + DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); return ERROR_NO_SOURCE_DRIVE; } /* @@ -850,7 +850,7 @@ InitializeSetup( Error = LoadSetupInf(pSetupData); if (Error != ERROR_SUCCESS) { - DPRINT1("LoadSetupInf() failed (Error 0x%lx)", Error); + DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error); return Error; } DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath); diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5f1044335ed..49c15e9ffe2 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1882,7 +1882,7 @@ CreatePartitionList(VOID) &ReturnSize); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx", Status); + DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx\n", Status); RtlFreeHeap(ProcessHeap, 0, List); return NULL; } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 47d24464977..9c25a1e6fbd 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2847,7 +2847,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) DiskEntry->DiskNumber, PartEntry->PartitionNumber); - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoFormat() failed: Status 0x%08lx\n", Status); MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); /* Reset the filesystem list */ @@ -2950,7 +2950,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (!NT_SUCCESS(Status)) { - DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoChkdsk() failed: Status 0x%08lx\n", Status); RtlStringCbPrintfA(Buffer, sizeof(Buffer), @@ -3060,7 +3060,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3164,7 +3164,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3825,7 +3825,7 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir) DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + DPRINT1("InstallMbrBootCodeToDisk() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); return FALSE; } diff --git a/base/system/services/database.c b/base/system/services/database.c index 8dbf148d43a..3ec18104158 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -2273,7 +2273,7 @@ ScmAutoStartServices(VOID) } else { - DPRINT1("WARNING: Could not open the associated Safe Boot key"); + DPRINT1("WARNING: Could not open the associated Safe Boot key\n"); CurrentService->ServiceVisited = FALSE; } }

1 year, 1 month

[reactos] 01/01: [CMD] Use correct console input mode in ConInString()

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98353cdb376fa507b9201… commit 98353cdb376fa507b9201982ed956092149de363 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 16 21:48:51 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 16 21:58:54 2023 +0100 [CMD] Use correct console input mode in ConInString() ENABLE_PROCESSED_INPUT is necessary to correctly deal with CR-LF and display it only when necessary. Fixes cmd:batch winetests. Addendum to commit db219e45c --- base/shell/cmd/console.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c index ba718fbc076..de35fa7f373 100644 --- a/base/shell/cmd/console.c +++ b/base/shell/cmd/console.c @@ -96,7 +96,7 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) hFile = GetStdHandle(STD_INPUT_HANDLE); GetConsoleMode(hFile, &dwOldMode); - SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + SetConsoleMode(hFile, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); @@ -106,10 +106,9 @@ VOID ConInString(LPTSTR lpInput, DWORD dwLength) #endif for (p = lpInput; *p; p++) { - if (*p == _T('\r')) // Terminate at the next carriage-return. + if (*p == _T('\r')) // Terminate at the carriage-return. { *p = _T('\0'); - ConOutChar(_T('\n')); // Output newline as well. break; } }

1 year, 1 month

[reactos] 01/01: [WIN32KNT_APITEST] 2 minor code improvements and a first fix (#5980)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5c3bb5bcedf31b99adbf… commit a5c3bb5bcedf31b99adbfefcbf6ce60c6f8d241a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Nov 16 21:57:10 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 21:57:10 2023 +0100 [WIN32KNT_APITEST] 2 minor code improvements and a first fix (#5980) - Update .rc filename; addendum to 7ad21a4 (r70458). - Move one '#include "resource.h"' around to where it is needed. Addendum to e1b2e7a (r29284) then ec5e0ea (r48103). - Adjust all '#include <win32nt.h>' --- modules/rostests/apitests/win32nt/CMakeLists.txt | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c | 2 +- .../apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c | 2 +- .../rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c | 2 +- .../rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c | 3 ++- modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c | 2 +- modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c | 2 +- .../apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c | 2 +- modules/rostests/apitests/win32nt/w32knapi.h | 1 - modules/rostests/apitests/win32nt/{w32knapi.rc => win32knt.rc} | 0 64 files changed, 63 insertions(+), 63 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 9968d8a0c9d..cab6970201e 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -76,7 +76,7 @@ list(APPEND PCH_SKIP_SOURCE add_executable(win32knt_apitest ${SOURCE} ${PCH_SKIP_SOURCE} - w32knapi.rc) + win32knt.rc) target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools) set_module_type(win32knt_apitest win32cui) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c index 4e0f5c8ec4f..5ba2958cec1 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDdCreateDirectDrawObject) { diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c index 78d1af7a325..43cb7b92deb 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDdDeleteDirectDrawObject) { diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 3b380dabbe0..16ffc45ec07 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" #include <ddrawi.h> diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c index 8ff437e81f2..c8099055eed 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiArcInternal) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c index 95f838f315c..e46dadf0f37 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiBitBlt) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c index c5f27cc68ed..379207e79f8 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCombineRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c index fd0bd1601a7..fee272af496 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_NtGdiCreateBitmap_Params(void) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c index 34035295d07..5546f63c9d2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCreateCompatibleBitmap) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c index 9edb8e96201..013e6bbba39 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiCreateCompatibleDC) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c index 07fcad20a45..94453326e43 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* HBITMAP diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c index a464f829d27..6332deedb38 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiDeleteObjectApp) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c index 9893cbe4875..1cd434c088f 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" HPALETTE CreateTestPalette() diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c index a77d0c88fab..c8ec86b9db4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiEngCreatePalette) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c index 0393dbfbbb5..1dcadf6f7fa 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiEnumFontOpen) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c index 6dd1a22a86e..df6fe63aed0 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiExcludeClipRect) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c index 847c1377cef..996a45546b4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiExtSelectClipRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c index 3a75f9f0b9f..a7c139e5463 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* BOOL diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c index 729a7a49b5e..7fe302dc209 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" NTSTATUS (NTAPI diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c index e7d0f3e8edf..0a2cae7c8a1 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetBitmapBits) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c index f8069d60170..928af110fb2 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" /* taken from gdi32, bitmap.c */ UINT diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c index 107a00b8148..b06426f9c36 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetFontResourceInfoInternalW) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c index 05c501ea752..09628aad653 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetRandomRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c index df14a9f3f46..72d2f66661e 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiGetStockObject) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c index cbe66134ab7..3d55be7bbc9 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiIntersectClipRect) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c index ef28a23c8f2..d6e2ce9f721 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiOffsetClipRgn) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c index 82b99fd0cff..a834a6ec4ec 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" static diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c index 1eafc20b6a2..a36957304cb 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" static HBRUSH hbrush; static HBITMAP hbitmap; diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c index 0e39eb4d8bc..3799289de4c 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSaveDC) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c index ec5acdec3a3..3e1fdeabb78 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_SelectDIBSection(void) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c index 08451977cbb..d2db64e6e07 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectBrush) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c index 08e04b28a89..1ebc6b63782 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectFont) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c index 67e6d66d7eb..3f0a0c32282 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSelectPen) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c index 8b6fa267436..96477898192 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c @@ -5,7 +5,7 @@ * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiSetBitmapBits) { diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c index ff8e3e9dac9..dde7a5c18dd 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void ReadBits(HDC hDC, PDWORD OutBits) diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c index 33b4dfd4427..6f0e520baa4 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c @@ -5,7 +5,7 @@ * COPYRIGHT: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtGdiTransformPoints) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c index 7fd68813611..fe43b81103c 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndRoutine_DeregisterShellHookWindow(HWND hWnd) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c index c16bebe1649..aed4af88190 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c index 1d98af434da..aa345d1d599 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndOptRoutine_SetProgmanWindow(void) /* 0x4a */ diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c index 93f321c5f74..0b35a6bb284 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_HwndParamRoutine_SetWindowContextHelpId(HWND hWnd) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c index 9868434f018..55b37ea7cb3 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserCallHwndParamLock) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c index 1d269080bcd..da7905d1642 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" void Test_NoParamRoutine_CreateMenu(void) /* 0 */ diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c index 1fce205bdaf..5b3c405e606 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c index 5dccf655d6b..52281ee79b6 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserCountClipboardFormats) diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c index 45d9ea6fe3e..4b680725206 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c @@ -4,7 +4,7 @@ * PURPOSE: Test for NtUserCreateWindowEx */ -#include <win32nt.h> +#include "../win32nt.h" static inline diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c index 317234320f6..c600c248cbd 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" ULONG gMonitorCount = 0; HDC ghdcMonitor = 0; diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c index 5a954489145..cd084fff16f 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c index 2356344e88d..9dae79fa969 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserFindExistingCursorIcon) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c index 8e5e4cab544..c65ab07b974 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2022 Thomas Faber (thomas.faber(a)reactos.org) */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetAsyncKeyState) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c index 65002ced27a..3023d35c1c1 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetClassInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c index a5a2129987c..d89685782da 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c @@ -5,7 +5,8 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" +#include "../resource.h" START_TEST(NtUserGetIconInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c index 00e378dcddf..af8af7c44b4 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" #include <pseh/pseh2.h> typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID); diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c index 772d00b7355..d5e2712a023 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <win32nt.h> +#include "../win32nt.h" #include <pseh/pseh2.h> #define MAX_COUNT 8 diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c index d9587462dc5..fb81c2370d6 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserGetTitleBarInfo) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c index 9ff9e7d82f4..eadf710ac6d 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c @@ -6,7 +6,7 @@ * Copyright 2021 Hermes Belusca-Maito */ -#include <win32nt.h> +#include "../win32nt.h" #define NTOS_MODE_USER #include <ndk/exfuncs.h> diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c index fda02281348..5d84fa39336 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserRedrawWindow) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c index 4d9534563d0..a2daa8bbf80 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserScrollDC) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c index 8c00d39f3b7..687709982a1 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" FORCEINLINE PALETTEENTRY diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c index dd1067a5157..aad40f49698 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserSetTimer) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c index 491a67d0c92..9ecef4907b4 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" #include <winreg.h> diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c index 1263f19ac4c..2506783d885 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" START_TEST(NtUserToUnicodeEx) { diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c index 274be855dc4..7ff974de766 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c @@ -5,7 +5,7 @@ * PROGRAMMERS: */ -#include <win32nt.h> +#include "../win32nt.h" diff --git a/modules/rostests/apitests/win32nt/w32knapi.h b/modules/rostests/apitests/win32nt/w32knapi.h index 57f00a63fa7..a2bfab000c0 100644 --- a/modules/rostests/apitests/win32nt/w32knapi.h +++ b/modules/rostests/apitests/win32nt/w32knapi.h @@ -27,7 +27,6 @@ #include <ntgdihdl.h> #include "../apitest.h" -#include "resource.h" typedef struct { diff --git a/modules/rostests/apitests/win32nt/w32knapi.rc b/modules/rostests/apitests/win32nt/win32knt.rc similarity index 100% rename from modules/rostests/apitests/win32nt/w32knapi.rc rename to modules/rostests/apitests/win32nt/win32knt.rc

1 year, 1 month

[reactos] 02/02: [NTDLL_APITEST] Write some tests for NtSetDefaultLocale

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d8ce79080499741713c8… commit 1d8ce79080499741713c8d63b894331fd1bb09d9 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Nov 12 11:39:04 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Nov 16 21:09:08 2023 +0100 [NTDLL_APITEST] Write some tests for NtSetDefaultLocale --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/NtSetDefaultLocale.c | 43 ++++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 46 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index acc24d45a3e..f48d4e53dec 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -47,6 +47,7 @@ list(APPEND SOURCE NtQueryVolumeInformationFile.c NtReadFile.c NtSaveKey.c + NtSetDefaultLocale.c NtSetInformationFile.c NtSetInformationProcess.c NtSetInformationThread.c diff --git a/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c b/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c new file mode 100644 index 00000000000..ad50dac80fa --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetDefaultLocale.c @@ -0,0 +1,43 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtSetDefaultLocale API + * COPYRIGHT: Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +START_TEST(NtSetDefaultLocale) +{ + NTSTATUS Status; + + Status = NtSetDefaultLocale(TRUE, 0xffffffff); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0xfffffffe); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x7fffffff); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x7ffffffe); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x80000000); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x80000001); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 0x10000); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + Status = NtSetDefaultLocale(TRUE, 1); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + Status = NtSetDefaultLocale(TRUE, 0x0C); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); + + Status = NtSetDefaultLocale(TRUE, 0x1000); + ok_ntstatus(Status, STATUS_OBJECT_NAME_NOT_FOUND); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 641a756f261..6d22f349692 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -43,6 +43,7 @@ extern void func_NtQueryValueKey(void); extern void func_NtQueryVolumeInformationFile(void); extern void func_NtReadFile(void); extern void func_NtSaveKey(void); +extern void func_NtSetDefaultLocale(void); extern void func_NtSetInformationFile(void); extern void func_NtSetInformationProcess(void); extern void func_NtSetInformationThread(void); @@ -142,6 +143,7 @@ const struct test winetest_testlist[] = { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, { "NtReadFile", func_NtReadFile }, { "NtSaveKey", func_NtSaveKey}, + { "NtSetDefaultLocale", func_NtSetDefaultLocale }, { "NtSetInformationFile", func_NtSetInformationFile }, { "NtSetInformationProcess", func_NtSetInformationProcess }, { "NtSetInformationThread", func_NtSetInformationThread },

1 year, 1 month

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

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 November 2023