Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [INF] Add better device descriptions for Original Xbox
by Stanislav Motylkov 31 May '20

31 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c504f4c57081f379e603… commit 1c504f4c57081f379e60393d898f2e01786d991f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jun 1 00:30:51 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Jun 1 00:30:51 2020 +0300 [INF] Add better device descriptions for Original Xbox CORE-16216 --- media/inf/hal.inf | 21 +++++++++++++++++++++ media/inf/machine.inf | 17 +++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/media/inf/hal.inf b/media/inf/hal.inf index f631cd14dd5..9ae5318a4f7 100644 --- a/media/inf/hal.inf +++ b/media/inf/hal.inf @@ -23,10 +23,13 @@ HKR, , Icon, 0, "-27" [Manufacturer] %GenericMfg% = GenericMfg +%MsftMfg% = MsftMfg [GenericMfg] %acpipic_up.DeviceDesc% = NO_DRV,acpipic_up %e_isa_up.DeviceDesc% = NO_DRV,e_isa_up + +[MsftMfg] %xbox.DeviceDesc% = NO_DRV,xbox ;------------------------------ NO DRIVER ----------------------------- @@ -46,6 +49,8 @@ ComputerClassName = "Computer" GenericMfg = "(Generic computers)" acpipic_up.DeviceDesc = "ACPI Uniprocessor PC" e_isa_up.DeviceDesc = "Standard Uniprocessor PC" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0405] @@ -53,6 +58,8 @@ ComputerClassName = "Počítač" GenericMfg = "(Obecné počítače)" acpipic_up.DeviceDesc = "Jednoprocesorové PC s ACPI rozhraním" e_isa_up.DeviceDesc = "Standardní jednoprocesorové PC" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0a] @@ -63,6 +70,8 @@ ComputerClassName = "Equipo" GenericMfg = "(Equipos genéricos)" acpipic_up.DeviceDesc = "PC con uniprocesador ACPI" e_isa_up.DeviceDesc = "PC con uniprocesador estándar" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0415] @@ -73,6 +82,8 @@ ComputerClassName = "Komputer" GenericMfg = "(Komputery standardowe)" acpipic_up.DeviceDesc = "Komputer PC z interfejsem ACPI" e_isa_up.DeviceDesc = "Standardowy komputer PC" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0418] @@ -83,6 +94,8 @@ ComputerClassName = "Calculator" GenericMfg = "(calculatoare generice)" acpipic_up.DeviceDesc = "PC uniprocesor ACPI" e_isa_up.DeviceDesc = "PC uniprocesor standard" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0419] @@ -93,6 +106,8 @@ ComputerClassName = "Компьютер" GenericMfg = "(Универсальный компьютер)" acpipic_up.DeviceDesc = "ACPI однопроцессорный ПК" e_isa_up.DeviceDesc = "Стандартный однопроцессорный ПК" + +MsftMfg = "Корпорация Microsoft" xbox.DeviceDesc = "Оригинальный Xbox (на базе x86)" [Strings.041f] @@ -103,6 +118,8 @@ ComputerClassName = "Bilgisayar" GenericMfg = "(Umûmî Bilgisayarlar)" acpipic_up.DeviceDesc = "ACPI Tek İşlemcili PC" e_isa_up.DeviceDesc = "Ölçünlü Tek İşlemcili PC" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0422] @@ -113,10 +130,14 @@ ComputerClassName = "Комп'ютер" GenericMfg = "(Стандартний комп'ютер)" acpipic_up.DeviceDesc = "ACPI однопроцесорний ПК" e_isa_up.DeviceDesc = "Стандартний однопроцесорний ПК" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" [Strings.0804] GenericMfg = "(通用计算机)" acpipic_up.DeviceDesc = "ACPI 单处理器 PC" e_isa_up.DeviceDesc = "标准单处理器 PC" + +MsftMfg = "Microsoft Corporation" xbox.DeviceDesc = "Original Xbox (x86 based)" diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 744907fed7b..d107e6be95f 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -24,6 +24,7 @@ HKR, , Icon, 0, "-27" [Manufacturer] %GenericMfg% = GenericMfg %IntelMfg% = IntelMfg +%nVidiaMfg% = nVidiaMfg [GenericMfg] %*PNP0000.DeviceDesc% = NO_DRV,*PNP0000 @@ -69,6 +70,14 @@ HKR, , Icon, 0, "-27" %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192 +[nVidiaMfg] +%PCI\VEN_10DE&DEV_01B2.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_10DE&DEV_01B2 +%PCI\VEN_10DE&DEV_01B4.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B4 +%PCI\VEN_10DE&DEV_01B7.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B7 +%PCI\VEN_10DE&DEV_01B8.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B8 +%PCI\VEN_10DE&DEV_02A5.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_02A5 +%PCI\VEN_10DE&DEV_02A6.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_02A6 + ;---------------------------- NO DRIVER REQ ----------------------------- [NO_DRV] @@ -192,6 +201,14 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Br PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" +nVidiaMfg = "nVidia Corporation" +PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce PCI to ISA Bridge" +PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce SMBus Controller" +PCI\VEN_10DE&DEV_01B7.DeviceDesc = "nVidia nForce AGP to PCI Bridge" +PCI\VEN_10DE&DEV_01B8.DeviceDesc = "nVidia nForce PCI to PCI Bridge" +PCI\VEN_10DE&DEV_02A5.DeviceDesc = "nVidia MCPX CPU Bridge" +PCI\VEN_10DE&DEV_02A6.DeviceDesc = "nVidia MCPX Memory Controller" + [Strings.0405] SystemClassName = "Systémová zařízení"

1 0

[reactos] 01/01: [SCHEDSVC] Implement the job start time calculation for given days of month
by Eric Kohl 31 May '20

31 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=505b9f8052de95d6c4734… commit 505b9f8052de95d6c4734b7a94cdc2a88d1356b4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 31 22:33:49 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 31 22:33:49 2020 +0200 [SCHEDSVC] Implement the job start time calculation for given days of month --- base/services/schedsvc/job.c | 69 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 9 deletions(-) diff --git a/base/services/schedsvc/job.c b/base/services/schedsvc/job.c index 2f24b95c4d7..558ac3797dd 100644 --- a/base/services/schedsvc/job.c +++ b/base/services/schedsvc/job.c @@ -32,6 +32,8 @@ RTL_RESOURCE JobListLock; LIST_ENTRY StartListHead; RTL_RESOURCE StartListLock; +static WORD wDaysArray[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + /* FUNCTIONS *****************************************************************/ @@ -449,13 +451,26 @@ done: } +static +WORD +DaysOfMonth( + WORD wMonth, + WORD wYear) +{ + if (wMonth == 2 && wYear % 4 == 0 && wYear % 400 != 0) + return 29; + + return wDaysArray[wMonth]; +} + + VOID CalculateNextStartTime( _In_ PJOB pJob) { SYSTEMTIME CurrentSystemTime, StartSystemTime; FILETIME StartFileTime; - WORD wDaysOffset, wTempOffset, i, wJobDayOfWeek; + WORD wDaysOffset, wTempOffset, i, wJobDayOfWeek, wJobDayOfMonth; DWORD_PTR CurrentTimeMs; BOOL bDaysOffsetValid; @@ -469,13 +484,6 @@ CalculateNextStartTime( CurrentTimeMs = (DWORD_PTR)CurrentSystemTime.wHour * 3600000 + (DWORD_PTR)CurrentSystemTime.wMinute * 60000; - CopyMemory(&StartSystemTime, &CurrentSystemTime, sizeof(SYSTEMTIME)); - - StartSystemTime.wMilliseconds = 0; - StartSystemTime.wSecond = 0; - StartSystemTime.wHour = (WORD)(pJob->JobTime / 3600000); - StartSystemTime.wMinute = (WORD)((pJob->JobTime % 3600000) / 60000); - bDaysOffsetValid = FALSE; wDaysOffset = 0; if ((pJob->DaysOfWeek == 0) && (pJob->DaysOfMonth == 0)) @@ -497,7 +505,7 @@ CalculateNextStartTime( { if (pJob->DaysOfWeek & (1 << i)) { - /* Adjust the ranges */ + /* Adjust the range */ wJobDayOfWeek = (i + 1) % 7; TRACE("wJobDayOfWeek: %hu\n", wJobDayOfWeek); TRACE("CurrentSystemTime.wDayOfWeek: %hu\n", CurrentSystemTime.wDayOfWeek); @@ -533,12 +541,55 @@ CalculateNextStartTime( if (pJob->DaysOfMonth != 0) { FIXME("Support DaysOfMonth!\n"); + for (i = 0; i < 31; i++) + { + if (pJob->DaysOfMonth & (1 << i)) + { + /* Adjust the range */ + wJobDayOfMonth = i + 1; + FIXME("wJobDayOfMonth: %hu\n", wJobDayOfMonth); + FIXME("CurrentSystemTime.wDay: %hu\n", CurrentSystemTime.wDay); + + if ((CurrentSystemTime.wDay > wJobDayOfMonth) || + ((CurrentSystemTime.wDay == wJobDayOfMonth) && (CurrentTimeMs >= pJob->JobTime))) + { + wTempOffset = DaysOfMonth(CurrentSystemTime.wMonth, CurrentSystemTime.wYear) - + CurrentSystemTime.wDay + wJobDayOfMonth; + FIXME("wTempOffset: %hu\n", wTempOffset); + } + else + { + wTempOffset = wJobDayOfMonth - CurrentSystemTime.wDay; + FIXME("wTempOffset: %hu\n", wTempOffset); + } + + /* Use the smallest offset */ + if (bDaysOffsetValid == FALSE) + { + wDaysOffset = wTempOffset; + bDaysOffsetValid = TRUE; + } + else + { + if (wTempOffset < wDaysOffset) + wDaysOffset = wTempOffset; + } + } + } } } TRACE("wDaysOffset: %hu\n", wDaysOffset); + CopyMemory(&StartSystemTime, &CurrentSystemTime, sizeof(SYSTEMTIME)); + + StartSystemTime.wMilliseconds = 0; + StartSystemTime.wSecond = 0; + StartSystemTime.wHour = (WORD)(pJob->JobTime / 3600000); + StartSystemTime.wMinute = (WORD)((pJob->JobTime % 3600000) / 60000); + SystemTimeToFileTime(&StartSystemTime, &StartFileTime); + pJob->StartTime.u.LowPart = StartFileTime.dwLowDateTime; pJob->StartTime.u.HighPart = StartFileTime.dwHighDateTime; if (bDaysOffsetValid && wDaysOffset != 0)

1 0

[reactos] 01/01: [SCHEDSVC] Fix the job start time calculation for given days of week.
by Eric Kohl 31 May '20

31 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70c64bde0822d1334968… commit d70c64bde0822d133496840620c92e67b80c6bdb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 31 15:48:07 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 31 15:49:22 2020 +0200 [SCHEDSVC] Fix the job start time calculation for given days of week. --- base/services/schedsvc/job.c | 125 +++++++++++++++++++++++++------------------ 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/base/services/schedsvc/job.c b/base/services/schedsvc/job.c index e1a8f013b2d..2f24b95c4d7 100644 --- a/base/services/schedsvc/job.c +++ b/base/services/schedsvc/job.c @@ -449,81 +449,102 @@ done: } -static -WORD -DaysOfMonth( - WORD wMonth, - WORD wYear) -{ - WORD wDaysArray[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - - if (wMonth == 2 && wYear % 4 == 0 && wYear % 400 != 0) - return 29; - - return wDaysArray[wMonth]; -} - - VOID CalculateNextStartTime( _In_ PJOB pJob) { - SYSTEMTIME StartTime; - FILETIME FileTime; - DWORD_PTR Now; + SYSTEMTIME CurrentSystemTime, StartSystemTime; + FILETIME StartFileTime; + WORD wDaysOffset, wTempOffset, i, wJobDayOfWeek; + DWORD_PTR CurrentTimeMs; + BOOL bDaysOffsetValid; TRACE("CalculateNextStartTime(%p)\n", pJob); + TRACE("JobTime: %lu\n", pJob->JobTime); + TRACE("DaysOfWeek: 0x%x\n", pJob->DaysOfWeek); + TRACE("DaysOfMonth: 0x%x\n", pJob->DaysOfMonth); - GetLocalTime(&StartTime); + GetLocalTime(&CurrentSystemTime); - Now = (DWORD_PTR)StartTime.wHour * 3600000 + - (DWORD_PTR)StartTime.wMinute * 60000; + CurrentTimeMs = (DWORD_PTR)CurrentSystemTime.wHour * 3600000 + + (DWORD_PTR)CurrentSystemTime.wMinute * 60000; - StartTime.wMilliseconds = 0; - StartTime.wSecond = 0; - StartTime.wHour = (WORD)(pJob->JobTime / 3600000); - StartTime.wMinute = (WORD)((pJob->JobTime % 3600000) / 60000); + CopyMemory(&StartSystemTime, &CurrentSystemTime, sizeof(SYSTEMTIME)); - if (pJob->DaysOfMonth != 0) - { - FIXME("Support DaysOfMonth!\n"); - } - else if (pJob->DaysOfWeek != 0) + StartSystemTime.wMilliseconds = 0; + StartSystemTime.wSecond = 0; + StartSystemTime.wHour = (WORD)(pJob->JobTime / 3600000); + StartSystemTime.wMinute = (WORD)((pJob->JobTime % 3600000) / 60000); + + bDaysOffsetValid = FALSE; + wDaysOffset = 0; + if ((pJob->DaysOfWeek == 0) && (pJob->DaysOfMonth == 0)) { - FIXME("Support DaysOfWeek!\n"); + if (CurrentTimeMs >= pJob->JobTime) + { + TRACE("Tomorrow!\n"); + wDaysOffset = 1; + } + + bDaysOffsetValid = TRUE; } else { - /* Start the job tomorrow */ - if (Now > pJob->JobTime) + if (pJob->DaysOfWeek != 0) { - if (StartTime.wDay + 1 > DaysOfMonth(StartTime.wMonth, StartTime.wYear)) + TRACE("DaysOfWeek!\n"); + for (i = 0; i < 7; i++) { - if (StartTime.wMonth == 12) - { - StartTime.wDay = 1; - StartTime.wMonth = 1; - StartTime.wYear++; - } - else + if (pJob->DaysOfWeek & (1 << i)) { - StartTime.wDay = 1; - StartTime.wMonth++; + /* Adjust the ranges */ + wJobDayOfWeek = (i + 1) % 7; + TRACE("wJobDayOfWeek: %hu\n", wJobDayOfWeek); + TRACE("CurrentSystemTime.wDayOfWeek: %hu\n", CurrentSystemTime.wDayOfWeek); + + /* Calculate the days offset */ + if ((CurrentSystemTime.wDayOfWeek > wJobDayOfWeek ) || + ((CurrentSystemTime.wDayOfWeek == wJobDayOfWeek) && (CurrentTimeMs >= pJob->JobTime))) + { + wTempOffset = 7 - CurrentSystemTime.wDayOfWeek + wJobDayOfWeek; + TRACE("wTempOffset: %hu\n", wTempOffset); + } + else + { + wTempOffset = wJobDayOfWeek - CurrentSystemTime.wDayOfWeek; + TRACE("wTempOffset: %hu\n", wTempOffset); + } + + /* Use the smallest offset */ + if (bDaysOffsetValid == FALSE) + { + wDaysOffset = wTempOffset; + bDaysOffsetValid = TRUE; + } + else + { + if (wTempOffset < wDaysOffset) + wDaysOffset = wTempOffset; + } } } - else - { - StartTime.wDay++; - } + } + + if (pJob->DaysOfMonth != 0) + { + FIXME("Support DaysOfMonth!\n"); } } - TRACE("Next start: %02hu:%02hu %02hu.%02hu.%hu\n", StartTime.wHour, - StartTime.wMinute, StartTime.wDay, StartTime.wMonth, StartTime.wYear); + TRACE("wDaysOffset: %hu\n", wDaysOffset); - SystemTimeToFileTime(&StartTime, &FileTime); - pJob->StartTime.u.LowPart = FileTime.dwLowDateTime; - pJob->StartTime.u.HighPart = FileTime.dwHighDateTime; + SystemTimeToFileTime(&StartSystemTime, &StartFileTime); + pJob->StartTime.u.LowPart = StartFileTime.dwLowDateTime; + pJob->StartTime.u.HighPart = StartFileTime.dwHighDateTime; + if (bDaysOffsetValid && wDaysOffset != 0) + { + pJob->StartTime.QuadPart += ((ULONGLONG)wDaysOffset * 24 * 60 * 60 * 10000); + } }

1 0

[reactos] 01/01: [NTDLL] Use lowest OS version GUID in the application manifest, instead of highest
by Timo Kreuzer 31 May '20

31 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb99761bc168f9239c6e1… commit cb99761bc168f9239c6e126546cf9db02f5ca6ff Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Mar 1 23:40:57 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun May 31 13:14:01 2020 +0200 [NTDLL] Use lowest OS version GUID in the application manifest, instead of highest --- dll/ntdll/ldr/ldrinit.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index cdf51c64b38..f2b2116e782 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1636,8 +1636,13 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) if (ContextCompatInfo->ElementCount == 0) return; - /* Search for known GUID's, starting from newest to oldest. */ - for (cur = 0; cur < RTL_NUMBER_OF(KnownCompatGuids); ++cur) + /* Search for known GUIDs, starting from oldest to newest. + Note that on Windows it is somewhat reversed, starting from the latest known + version, going down. But we are not Windows, trying to allow a lower version, + we are ReactOS trying to fake a higher version. So we interpret what Windows + does as "try the closest version to the actual version", so we start with the + lowest version, which is closest to Windows 2003, which we mostly are. */ + for (cur = RTL_NUMBER_OF(KnownCompatGuids) - 1; cur != -1; --cur) { for (n = 0; n < ContextCompatInfo->ElementCount; ++n) { @@ -1671,9 +1676,11 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) *pOldShimData = pShimData; } - /* Store the highest found version, and bail out. */ + /* Store the lowest found version, and bail out. */ pShimData->dwRosProcessCompatVersion = KnownCompatGuids[cur].Version; - DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", KnownCompatGuids[cur].Version); + DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x in manifest from %wZ\n", + KnownCompatGuids[cur].Version, + &(NtCurrentPeb()->ProcessParameters->ImagePathName)); return; } }

1 0

[reactos] 01/01: [MSTASK] Add C stubs and comment out decorated exports
by Timo Kreuzer 31 May '20

31 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ed8b916e4ed42a4111e0… commit 0ed8b916e4ed42a4111e0899b400acbdc9369897 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Feb 28 14:09:57 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun May 31 12:26:37 2020 +0200 [MSTASK] Add C stubs and comment out decorated exports MSVC's LINK is not able to export both the undecorated and decorated symbol from the same dll. This results in an incoherence between the spec file entries and the actual exports, breaking the dll export versioning. --- dll/win32/mstask/CMakeLists.txt | 5 +- dll/win32/mstask/mstask.spec | 48 +++++++------- dll/win32/mstask/stubs.c | 135 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 25 deletions(-) diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt index 5dec2c43a8d..3f6c58dabb9 100644 --- a/dll/win32/mstask/CMakeLists.txt +++ b/dll/win32/mstask/CMakeLists.txt @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +include_directories(BEFORE + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_BINARY_DIR}/dll/win32/netapi32) generate_idl_iids(mstask_local.idl) spec2def(mstask.dll mstask.spec) @@ -10,6 +12,7 @@ list(APPEND SOURCE task.c task_scheduler.c task_trigger.c + stubs.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c) diff --git a/dll/win32/mstask/mstask.spec b/dll/win32/mstask/mstask.spec index 0b6c23b79de..f443f815e3f 100644 --- a/dll/win32/mstask/mstask.spec +++ b/dll/win32/mstask/mstask.spec @@ -1,28 +1,28 @@ -@ stub ConvertAtJobsToTasks +@ stdcall ConvertAtJobsToTasks() @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub GetNetScheduleAccountInformation -@ stub NetrJobAdd -@ stub NetrJobDel -@ stub NetrJobEnum -@ stub NetrJobGetInfo -@ stub SAGetAccountInformation -@ stub SAGetNSAccountInformation -@ stub SASetAccountInformation -@ stub SASetNSAccountInformation -@ stub SetNetScheduleAccountInformation -@ stub _ConvertAtJobsToTasks@0 -@ stub _DllCanUnloadNow@0 -@ stub _DllGetClassObject@12 -@ stub _GetNetScheduleAccountInformation@12 -@ stub _NetrJobAdd@12 -@ stub _NetrJobDel@12 -@ stub _NetrJobEnum@20 -@ stub _NetrJobGetInfo@12 -@ stub _SAGetAccountInformation@16 -@ stub _SAGetNSAccountInformation@12 -@ stub _SASetAccountInformation@20 -@ stub _SASetNSAccountInformation@12 -@ stub _SetNetScheduleAccountInformation@12 +@ stdcall GetNetScheduleAccountInformation(wstr long ptr) +@ stdcall NetrJobAdd(wstr ptr ptr) +@ stdcall NetrJobDel(wstr long long) +@ stdcall NetrJobEnum(wstr ptr long ptr ptr) +@ stdcall NetrJobGetInfo(wstr long ptr) +@ stdcall SAGetAccountInformation(wstr ptr long ptr) +@ stdcall SAGetNSAccountInformation(wstr long ptr) +@ stdcall SASetAccountInformation(wstr wstr wstr wstr long) +@ stdcall SASetNSAccountInformation(wstr wstr wstr) +@ stdcall SetNetScheduleAccountInformation(wstr wstr wstr) +#@ stdcall _ConvertAtJobsToTasks@0() mstask.ConvertAtJobsToTasks +#@ stdcall _DllCanUnloadNow@0() DllCanUnloadNow +#@ stdcall _DllGetClassObject@12(ptr ptr ptr) DllGetClassObject +#@ stdcall _GetNetScheduleAccountInformation@12(wstr ptr long ptr) GetNetScheduleAccountInformation +#@ stdcall _NetrJobAdd@12(wstr ptr ptr) NetrJobAdd +#@ stdcall _NetrJobDel@12(wstr long long) NetrJobDel +#@ stdcall _NetrJobEnum@20(wstr ptr long ptr ptr) NetrJobEnum +#@ stdcall _NetrJobGetInfo@12(wstr long ptr) NetrJobGetInfo +#@ stdcall _SAGetAccountInformation@16(wstr ptr long ptr) SAGetAccountInformation +#@ stdcall _SAGetNSAccountInformation@12(wstr long ptr) SAGetNSAccountInformation +#@ stdcall _SASetAccountInformation@20(wstr wstr wstr wstr long) SASetAccountInformation +#@ stdcall _SASetNSAccountInformation@12(wstr wstr wstr) SASetNSAccountInformation +#@ stdcall _SetNetScheduleAccountInformation@12(wstr wstr wstr) SetNetScheduleAccountInformation @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dll/win32/mstask/stubs.c b/dll/win32/mstask/stubs.c new file mode 100644 index 00000000000..c4d84984ac0 --- /dev/null +++ b/dll/win32/mstask/stubs.c @@ -0,0 +1,135 @@ + +#include "precomp.h" +#include <atsvc_c.h> + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); + +typedef PWSTR SASEC_HANDLE; + +HRESULT +WINAPI +ConvertAtJobsToTasks(void) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// See https://docs.microsoft.com/en-us/windows/win32/api/atacct/nf-atacct-getnets… +HRESULT +WINAPI +GetNetScheduleAccountInformation( + _In_z_ LPCWSTR pwszServerName, + _In_ DWORD ccAccount, + _Out_bytecap_(ccAccount) WCHAR wszAccount[]) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +// For the following functions see https://winprotocoldoc.blob.core.windows.net/productionwindowsarchives/MS-T… + +NET_API_STATUS +WINAPI +NetrJobAdd( + _In_z_ ATSVC_HANDLE ServerName, + _In_ LPAT_INFO pAtInfo, + _Out_ LPDWORD pJobId) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +NET_API_STATUS +WINAPI +NetrJobDel( + _In_z_ ATSVC_HANDLE ServerName, + _In_ DWORD MinJobId, + _In_ DWORD MaxJobId) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +NET_API_STATUS +WINAPI +NetrJobEnum( + _In_z_ ATSVC_HANDLE ServerName, + _Inout_ LPAT_ENUM_CONTAINER pEnumContainer, + _In_ DWORD PreferedMaximumLength, + _Out_ LPDWORD pTotalEntries, + _Inout_ LPDWORD pResumeHandle) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +NET_API_STATUS +WINAPI +NetrJobGetInfo( + _In_z_ ATSVC_HANDLE ServerName, + _In_ DWORD JobId, + _Outptr_ LPAT_INFO* ppAtInfo) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +#define MAX_BUFFER_SIZE 273 + +HRESULT +WINAPI +SAGetAccountInformation( + _In_z_ SASEC_HANDLE Handle, + _In_z_ const wchar_t* pwszJobName, + _In_range_(0, MAX_BUFFER_SIZE) DWORD ccBufferSize, + _Inout_updates_z_(ccBufferSize) wchar_t wszBuffer[]) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +SAGetNSAccountInformation( + _In_z_ SASEC_HANDLE Handle, + _In_range_(0, MAX_BUFFER_SIZE) DWORD ccBufferSize, + _Inout_updates_z_(ccBufferSize) wchar_t wszBuffer[]) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +SASetAccountInformation( + _In_z_ SASEC_HANDLE Handle, + _In_z_ const wchar_t* pwszJobName, + _In_z_ const wchar_t* pwszAccount, + _In_z_ const wchar_t* pwszPassword, + _In_ DWORD dwJobFlags) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +SASetNSAccountInformation( + _In_z_ SASEC_HANDLE Handle, + _In_z_ const wchar_t* pwszAccount, + _In_z_ const wchar_t* pwszPassword) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +SetNetScheduleAccountInformation( + _In_z_ LPCWSTR pwszServerName, + _In_z_ LPCWSTR pwszAccount, + _In_z_ LPCWSTR pwszPassword) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +}

1 0

[reactos] 01/01: [NTOSKRNL] Group files in the project file based on directory layout
by Mark Jansen 29 May '20

29 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d9b385715488e40aa059… commit 2d9b385715488e40aa0592033146057708f2b347 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed May 27 22:28:00 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri May 29 21:10:10 2020 +0200 [NTOSKRNL] Group files in the project file based on directory layout --- ntoskrnl/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index be575b9892f..9a003de5788 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -21,6 +21,8 @@ add_executable(ntoskrnl set_property(TARGET ntoskrnl PROPERTY ENABLE_EXPORTS TRUE) set_target_properties(ntoskrnl PROPERTIES DEFINE_SYMBOL "") +source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE}) + if(ARCH STREQUAL "i386") set_entrypoint(ntoskrnl KiSystemStartup 4) else() @@ -61,4 +63,4 @@ endif() add_asm_files(ntdllsys_asm ntdll.S) add_library(ntdllsys ${ntdllsys_asm}) set_target_properties(ntdllsys PROPERTIES LINKER_LANGUAGE "C") -add_dependencies(ntdllsys asm) \ No newline at end of file +add_dependencies(ntdllsys asm)

1 0

[reactos] 01/01: [GITHUB] Set up necessary environment variables for Flex and Bison Decrease ccache size, based on observations Print ccache statistics in the end of build
by Victor Perevertkin 28 May '20

28 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dc9f0ae439970552f0e5… commit 2dc9f0ae439970552f0e5cd1a853b260ec85422f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu May 28 23:11:53 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu May 28 23:11:53 2020 +0300 [GITHUB] Set up necessary environment variables for Flex and Bison Decrease ccache size, based on observations Print ccache statistics in the end of build --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9326331c4e..2b4cec87147 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: run: | echo "::set-env name=CCACHE_BASEDIR::${{github.workspace}}" echo "::set-env name=CCACHE_DIR::${{github.workspace}}/ccache" - echo "::set-env name=CCACHE_MAXSIZE::2G" + echo "::set-env name=CCACHE_MAXSIZE::1G" echo "::set-env name=CCACHE_SLOPPINESS::time_macros" - name: Configure run: | @@ -42,6 +42,8 @@ jobs: run: | echo 'cd ${{github.workspace}}/build && cmake --build . --target bootcd && cmake --build . --target livecd' > commands ${{github.workspace}}/rosbe/RosBE.sh < 'commands' + - name: Print ccache statistics + run: ccache -s - name: Upload bootcd uses: actions/upload-artifact@v1 with: @@ -64,6 +66,8 @@ jobs: curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin echo "::add-path::${{github.workspace}}\bin" + echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" + echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" - name: Add CL to PATH uses: ilammy/msvc-dev-cmd@v1 with: @@ -109,6 +113,8 @@ jobs: curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin echo "::add-path::${{github.workspace}}\bin" + echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" + echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" - name: Add CL to PATH uses: ilammy/msvc-dev-cmd@v1 with:

1 0

[reactos] 01/01: [CPPRT][CRT] Avoid extern assembly declarations with no type. CORE-17088
by Thomas Faber 28 May '20

28 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4066536c27dcde9442b6… commit e4066536c27dcde9442b680ecab0cff4a5fd3fe5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu May 28 14:25:31 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu May 28 14:26:48 2020 +0200 [CPPRT][CRT] Avoid extern assembly declarations with no type. CORE-17088 Fixes build with ML 14.26. --- sdk/lib/cpprt/amd64/cpprt.s | 4 ++-- sdk/lib/cpprt/i386/cpprt.s | 4 ++-- sdk/lib/crt/stdlib/clang-alias.s | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/lib/cpprt/amd64/cpprt.s b/sdk/lib/cpprt/amd64/cpprt.s index ebaebb9861d..36c09fb80d8 100644 --- a/sdk/lib/cpprt/amd64/cpprt.s +++ b/sdk/lib/cpprt/amd64/cpprt.s @@ -2,8 +2,8 @@ .code -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig : PROC ALIAS <&alias> = <&orig> ENDM diff --git a/sdk/lib/cpprt/i386/cpprt.s b/sdk/lib/cpprt/i386/cpprt.s index cfc3dc9e9cf..eeaf87f5d6a 100644 --- a/sdk/lib/cpprt/i386/cpprt.s +++ b/sdk/lib/cpprt/i386/cpprt.s @@ -2,8 +2,8 @@ .code -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig : PROC ALIAS <&alias> = <&orig> ENDM diff --git a/sdk/lib/crt/stdlib/clang-alias.s b/sdk/lib/crt/stdlib/clang-alias.s index 56550073af8..8609ee9f1da 100644 --- a/sdk/lib/crt/stdlib/clang-alias.s +++ b/sdk/lib/crt/stdlib/clang-alias.s @@ -2,8 +2,8 @@ .code -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig : PROC ALIAS <&alias> = <&orig> ENDM

1 0

[reactos] 01/01: [SHELL32][INCLUDE] Improve CheckEscapesA/W (#2795)
by Katayama Hirofumi MZ 28 May '20

28 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99b52df014e004531ab63… commit 99b52df014e004531ab6389284e087b9bb8837cf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 28 10:58:26 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 28 10:58:26 2020 +0900 [SHELL32][INCLUDE] Improve CheckEscapesA/W (#2795) Fix and improve shell32!CheckEscapesA/W functions. Add a testcase for shell32!CheckEscapesA/W to shell32_apitest. --- dll/win32/shell32/wine/shellstring.c | 38 ++--- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + modules/rostests/apitests/shell32/CheckEscapes.cpp | 177 +++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 4 +- 5 files changed, 198 insertions(+), 24 deletions(-) diff --git a/dll/win32/shell32/wine/shellstring.c b/dll/win32/shell32/wine/shellstring.c index 8bccd1c1563..8796f3813c3 100644 --- a/dll/win32/shell32/wine/shellstring.c +++ b/dll/win32/shell32/wine/shellstring.c @@ -30,6 +30,7 @@ #include "shell32_main.h" #include "undocshell.h" +#include "shlwapi_undoc.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -222,30 +223,25 @@ BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) * PARAMS * string [I/O] string to check and on return eventually quoted * len [I] length of string - * - * RETURNS - * length of actual string - * - * NOTES - * Not really sure if this function returns actually a value at all. */ -DWORD WINAPI CheckEscapesA( +VOID WINAPI CheckEscapesA( LPSTR string, /* [I/O] string to check ??*/ DWORD len) /* [I] is 0 */ { - LPWSTR wString; - DWORD ret = 0; + LPWSTR wString; + TRACE("(%s %d)\n", debugstr_a(string), len); - TRACE("(%s %d)\n", debugstr_a(string), len); - wString = LocalAlloc(LPTR, len * sizeof(WCHAR)); - if (wString) - { - MultiByteToWideChar(CP_ACP, 0, string, len, wString, len); - ret = CheckEscapesW(wString, len); - WideCharToMultiByte(CP_ACP, 0, wString, len, string, len, NULL, NULL); - LocalFree(wString); - } - return ret; + if (!string || !string[0]) + return; + + wString = LocalAlloc(LPTR, len * sizeof(WCHAR)); + if (!wString) + return; + + SHAnsiToUnicode(string, wString, len); + CheckEscapesW(wString, len); + SHUnicodeToAnsi(wString, string, len); + LocalFree(wString); } static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0}; @@ -255,7 +251,7 @@ static const WCHAR strEscapedChars[] = {' ','"',',',';','^',0}; * * See CheckEscapesA. */ -DWORD WINAPI CheckEscapesW( +VOID WINAPI CheckEscapesW( LPWSTR string, DWORD len) { @@ -273,7 +269,5 @@ DWORD WINAPI CheckEscapesW( for (;d > string;) *d-- = *s--; *d = '"'; - return size + 2; } - return size; } diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 3425c187d73..9bff4a9c09a 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE AddCommas.cpp CFSFolder.cpp + CheckEscapes.cpp CIDLData.cpp CMyComputer.cpp CShellDesktop.cpp diff --git a/modules/rostests/apitests/shell32/CheckEscapes.cpp b/modules/rostests/apitests/shell32/CheckEscapes.cpp new file mode 100644 index 00000000000..095dbaf766d --- /dev/null +++ b/modules/rostests/apitests/shell32/CheckEscapes.cpp @@ -0,0 +1,177 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CheckEscapesA/W + * PROGRAMMER: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include "shelltest.h" + +typedef void (WINAPI *FN_CheckEscapesA)(LPSTR string, DWORD len); +typedef void (WINAPI *FN_CheckEscapesW)(LPWSTR string, DWORD len); + +static FN_CheckEscapesA s_pCheckEscapesA; +static FN_CheckEscapesW s_pCheckEscapesW; + +typedef struct TESTENTRYA +{ + INT lineno; + LPCSTR input; + DWORD len; + LPCSTR output; +} TESTENTRYA; + +typedef struct TESTENTRYW +{ + INT lineno; + LPCWSTR input; + DWORD len; + LPCWSTR output; +} TESTENTRYW; + +static const TESTENTRYA s_entriesA[] = +{ + { __LINE__, "", 0, "" }, + { __LINE__, "", 1, "" }, + { __LINE__, "", 2, "" }, + { __LINE__, "", 3, "" }, + { __LINE__, "", 4, "" }, + { __LINE__, "", 5, "" }, + { __LINE__, "", 6, "" }, + { __LINE__, "ABC", 1, "" }, + { __LINE__, "ABC", 2, "A" }, + { __LINE__, "ABC", 3, "AB" }, + { __LINE__, "ABC", 4, "ABC" }, + { __LINE__, "ABC", 5, "ABC" }, + { __LINE__, "ABC", 6, "ABC" }, + { __LINE__, "AB C", 1, "" }, + { __LINE__, "AB C", 2, "A" }, + { __LINE__, "AB C", 3, "AB" }, + { __LINE__, "AB C", 4, "AB " }, + { __LINE__, "AB C", 5, "AB C" }, + { __LINE__, "AB C", 6, "\"AB C" }, + { __LINE__, "AB C ", 1, "" }, + { __LINE__, "AB C ", 2, "A" }, + { __LINE__, "AB C ", 3, "AB" }, + { __LINE__, "AB C ", 4, "AB " }, + { __LINE__, "AB C ", 5, "AB C" }, + { __LINE__, "AB C ", 6, "AB C " }, + { __LINE__, "AB,", 1, "" }, + { __LINE__, "AB,", 2, "A" }, + { __LINE__, "AB,", 3, "AB" }, + { __LINE__, "AB,", 4, "AB," }, + { __LINE__, "AB,", 5, "\"AB," }, + { __LINE__, "AB,", 6, "\"AB,\"" }, + { __LINE__, "AB\"", 1, "" }, + { __LINE__, "AB\"", 2, "A" }, + { __LINE__, "AB\"", 3, "AB" }, + { __LINE__, "AB\"", 4, "AB\"" }, + { __LINE__, "AB\"", 5, "\"AB\"" }, + { __LINE__, "AB\"", 6, "\"AB\"\"" }, + { __LINE__, "AB;", 1, "" }, + { __LINE__, "AB;", 2, "A" }, + { __LINE__, "AB;", 3, "AB" }, + { __LINE__, "AB;", 4, "AB;" }, + { __LINE__, "AB;", 5, "\"AB;" }, + { __LINE__, "AB;", 6, "\"AB;\"" }, + { __LINE__, "AB^", 1, "" }, + { __LINE__, "AB^", 2, "A" }, + { __LINE__, "AB^", 3, "AB" }, + { __LINE__, "AB^", 4, "AB^" }, + { __LINE__, "AB^", 5, "\"AB^" }, + { __LINE__, "AB^", 6, "\"AB^\"" }, +}; + +static const TESTENTRYW s_entriesW[] = +{ + { __LINE__, L"", 0, L"" }, + { __LINE__, L"", 1, L"" }, + { __LINE__, L"", 2, L"" }, + { __LINE__, L"", 3, L"" }, + { __LINE__, L"", 4, L"" }, + { __LINE__, L"", 5, L"" }, + { __LINE__, L"", 6, L"" }, + { __LINE__, L"ABC", 1, L"ABC" }, + { __LINE__, L"ABC", 2, L"ABC" }, + { __LINE__, L"ABC", 3, L"ABC" }, + { __LINE__, L"ABC", 4, L"ABC" }, + { __LINE__, L"ABC", 5, L"ABC" }, + { __LINE__, L"ABC", 6, L"ABC" }, + { __LINE__, L"AB C", 1, L"AB C" }, + { __LINE__, L"AB C", 2, L"AB C" }, + { __LINE__, L"AB C", 3, L"AB C" }, + { __LINE__, L"AB C", 4, L"AB C" }, + { __LINE__, L"AB C", 5, L"AB C" }, + { __LINE__, L"AB C", 6, L"\"AB C\"" }, + { __LINE__, L"AB C ", 1, L"AB C " }, + { __LINE__, L"AB C ", 2, L"AB C " }, + { __LINE__, L"AB C ", 3, L"AB C " }, + { __LINE__, L"AB C ", 4, L"AB C " }, + { __LINE__, L"AB C ", 5, L"AB C " }, + { __LINE__, L"AB C ", 6, L"AB C " }, + { __LINE__, L"AB,", 1, L"AB," }, + { __LINE__, L"AB,", 2, L"AB," }, + { __LINE__, L"AB,", 3, L"AB," }, + { __LINE__, L"AB,", 4, L"AB," }, + { __LINE__, L"AB,", 5, L"\"AB,\"" }, + { __LINE__, L"AB,", 6, L"\"AB,\"" }, + { __LINE__, L"AB\"", 1, L"AB\"" }, + { __LINE__, L"AB\"", 2, L"AB\"" }, + { __LINE__, L"AB\"", 3, L"AB\"" }, + { __LINE__, L"AB\"", 4, L"AB\"" }, + { __LINE__, L"AB\"", 5, L"\"AB\"\"" }, + { __LINE__, L"AB\"", 6, L"\"AB\"\"" }, + { __LINE__, L"AB;", 1, L"AB;" }, + { __LINE__, L"AB;", 2, L"AB;" }, + { __LINE__, L"AB;", 3, L"AB;" }, + { __LINE__, L"AB;", 4, L"AB;" }, + { __LINE__, L"AB;", 5, L"\"AB;\"" }, + { __LINE__, L"AB;", 6, L"\"AB;\"" }, + { __LINE__, L"AB^", 1, L"AB^" }, + { __LINE__, L"AB^", 2, L"AB^" }, + { __LINE__, L"AB^", 3, L"AB^" }, + { __LINE__, L"AB^", 4, L"AB^" }, + { __LINE__, L"AB^", 5, L"\"AB^\"" }, + { __LINE__, L"AB^", 6, L"\"AB^\"" }, +}; + +static void JustDoIt(void) +{ + SIZE_T i, count; + CHAR bufA[MAX_PATH]; + WCHAR bufW[MAX_PATH]; + + count = _countof(s_entriesA); + for (i = 0; i < count; ++i) + { + lstrcpynA(bufA, s_entriesA[i].input, _countof(bufA)); + s_pCheckEscapesA(bufA, s_entriesA[i].len); + ok(lstrcmpA(bufA, s_entriesA[i].output) == 0, + "Line %d: output expected '%s' vs got '%s'\n", + s_entriesA[i].lineno, s_entriesA[i].output, bufA); + } + + count = _countof(s_entriesW); + for (i = 0; i < count; ++i) + { + lstrcpynW(bufW, s_entriesW[i].input, _countof(bufW)); + s_pCheckEscapesW(bufW, s_entriesW[i].len); + ok(lstrcmpW(bufW, s_entriesW[i].output) == 0, + "Line %d: output expected '%ls' vs got '%ls'\n", + s_entriesW[i].lineno, s_entriesW[i].output, bufW); + } +} + +START_TEST(CheckEscapes) +{ + HINSTANCE hShell32 = GetModuleHandleA("shell32"); + s_pCheckEscapesA = (FN_CheckEscapesA)GetProcAddress(hShell32, "CheckEscapesA"); + s_pCheckEscapesW = (FN_CheckEscapesW)GetProcAddress(hShell32, "CheckEscapesW"); + if (s_pCheckEscapesA && s_pCheckEscapesW) + { + JustDoIt(); + } + else + { + skip("There is no CheckEscapesA/W\n"); + } +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index ba56769a97a..74c90e013c6 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -6,6 +6,7 @@ extern void func_AddCommas(void); extern void func_Control_RunDLLW(void); extern void func_CFSFolder(void); +extern void func_CheckEscapes(void); extern void func_CIDLData(void); extern void func_CMyComputer(void); extern void func_CShellDesktop(void); @@ -33,6 +34,7 @@ const struct test winetest_testlist[] = { "AddCommas", func_AddCommas }, { "Control_RunDLLW", func_Control_RunDLLW }, { "CFSFolder", func_CFSFolder }, + { "CheckEscapes", func_CheckEscapes }, { "CIDLData", func_CIDLData }, { "CMyComputer", func_CMyComputer }, { "CShellDesktop", func_CShellDesktop }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 3b7c5d6463c..4e55a38e274 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -611,8 +611,8 @@ HRESULT WINAPI SHCreateLinks( UINT uFlags, LPITEMIDLIST *lppidlLinks); -DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len); -DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len); +VOID WINAPI CheckEscapesA(LPSTR string, DWORD len); +VOID WINAPI CheckEscapesW(LPWSTR string, DWORD len); /* policy functions */ BOOL WINAPI SHInitRestricted(LPCVOID unused, LPCVOID inpRegKey);

1 0

[reactos] 01/01: [LABEL] wmain(): Initialize 'szBuffer' (#2867)
by Serge Gautherie 27 May '20

27 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a614c82e126861eb5fe5… commit 9a614c82e126861eb5fe59be0acc7930477a9d3a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed May 27 17:05:33 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 27 17:05:33 2020 +0200 [LABEL] wmain(): Initialize 'szBuffer' (#2867) Detected by Cppcheck: uninitvar. --- base/applications/cmdutils/label/label.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/base/applications/cmdutils/label/label.c b/base/applications/cmdutils/label/label.c index 6011f3d3549..fc4d8f9d0cd 100644 --- a/base/applications/cmdutils/label/label.c +++ b/base/applications/cmdutils/label/label.c @@ -142,8 +142,8 @@ PromptYesNo(VOID) int wmain(int argc, WCHAR *argv[]) { WCHAR szRootPath[] = L" :\\"; - WCHAR szBuffer[80]; - WCHAR szLabel[80]; + WCHAR szBuffer[80] = L""; + WCHAR szLabel[80] = L""; WCHAR szOldLabel[80]; DWORD dwSerialNr; INT len, i; @@ -151,9 +151,6 @@ int wmain(int argc, WCHAR *argv[]) /* Initialize the Console Standard Streams */ ConInitStdStreams(); - /* set empty label string */ - szLabel[0] = UNICODE_NULL; - /* print help */ if (argc > 1 && wcscmp(argv[1], L"/?") == 0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2020