Skip to content

Commit 51f84a8

Browse files
AmineKhaldiAmineKhaldi
committed
* Sync with trunk r55800.
svn path=/branches/arty-newcc/; revision=55802
2 parents 3b7da98 + d8b2cce commit 51f84a8

File tree

343 files changed

+23067
-4708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+23067
-4708
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ else()
7878
#useful stuff!
7979
include(CMakeParseArguments)
8080

81+
# this is needed as well
82+
link_directories(${REACTOS_SOURCE_DIR}/importlibs)
83+
8184
if(ENABLE_CCACHE)
8285
set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
8386
set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
@@ -222,7 +225,5 @@ else()
222225

223226
file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
224227

225-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
226-
227228
add_dependency_footer()
228229
endif()

‎base/applications/cacls/lang/da-DA.rc renamed to ‎base/applications/cacls/lang/da-DK.rc

File renamed without changes.

‎base/applications/cacls/rsrc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "lang/bg-BG.rc"
44
#include "lang/ca-ES.rc"
55
#include "lang/cs-CZ.rc"
6-
#include "lang/da-DA.rc"
6+
#include "lang/da-DK.rc"
77
#include "lang/de-DE.rc"
88
#include "lang/el-GR.rc"
99
#include "lang/en-US.rc"

‎base/setup/usetup/filesup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ SetupCopyFile(PWCHAR SourceFileName,
168168
FileHandleSource);
169169
if(!NT_SUCCESS(Status))
170170
{
171-
DPRINT1("NtCreateSection failed: %x\n", Status);
171+
DPRINT1("NtCreateSection failed: %x, %wZ\n", Status, SourceFileName);
172172
goto closesrc;
173173
}
174174

@@ -184,7 +184,7 @@ SetupCopyFile(PWCHAR SourceFileName,
184184
PAGE_READONLY );
185185
if(!NT_SUCCESS(Status))
186186
{
187-
DPRINT1("NtMapViewOfSection failed: %x\n", Status);
187+
DPRINT1("NtMapViewOfSection failed: %x, %wZ\n", Status, SourceFileName);
188188
goto closesrcsec;
189189
}
190190

‎base/setup/usetup/interface/devinst.c

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ InstallDriver(
5151
ULONG Disposition;
5252
NTSTATUS Status;
5353
BOOLEAN deviceInstalled = FALSE;
54+
UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters");
55+
LPWSTR keyboardClass = L"kbdclass\0";
56+
BOOLEAN keyboardDevice = FALSE;
5457

5558
/* Check if we know the hardware */
5659
if (!SetupFindFirstLineW(hInf, L"HardwareIdsDatabase", HardwareId, &Context))
@@ -63,9 +66,14 @@ InstallDriver(
6366
if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context)
6467
&& !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context)
6568
&& !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context)
66-
&& !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context)
67-
&& !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context))
68-
return FALSE;
69+
&& !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context))
70+
{
71+
if (!SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context))
72+
return FALSE;
73+
74+
keyboardDevice = TRUE;
75+
}
76+
6977
if (!INF_GetDataField(&Context, 1, &ImagePath))
7078
return FALSE;
7179

@@ -130,6 +138,17 @@ InstallDriver(
130138
ImagePath,
131139
(wcslen(ImagePath) + 1) * sizeof(WCHAR));
132140

141+
if (keyboardDevice)
142+
{
143+
DPRINT1("Installing keyboard class driver for '%S'\n", DeviceId);
144+
NtSetValueKey(hDeviceKey,
145+
&UpperFiltersU,
146+
0,
147+
REG_MULTI_SZ,
148+
keyboardClass,
149+
(wcslen(keyboardClass) + 2) * sizeof(WCHAR));
150+
}
151+
133152
/* Associate device with the service we just filled */
134153
Status = NtSetValueKey(
135154
hDeviceKey,

‎base/shell/explorer/notifyhook/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ add_library(notifyhook SHARED ${SOURCE})
1313
set_module_type(notifyhook win32dll)
1414

1515
add_importlibs(notifyhook user32 msvcrt kernel32)
16-
add_importlib_target(notifyhook.spec)
16+
add_importlib_target(notifyhook.spec notifyhook.dll)
1717
add_cd_file(TARGET notifyhook DESTINATION reactos/system32 FOR all)

‎base/system/autochk/autochk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ CheckVolume(
326326
NtDrivePath[wcslen(NtDrivePath)-1] = 0;
327327
RtlInitUnicodeString(&DrivePathU, NtDrivePath);
328328

329-
DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU);
329+
DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU);
330330
Status = ChkdskFunc(&DrivePathU,
331331
TRUE, // FixErrors
332332
TRUE, // Verbose

‎base/system/smss2/pagefile.c

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken)
9696
}
9797

9898
/* Parse the specified and get the name and arguments out of it */
99-
DPRINT1("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken);
99+
DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken);
100100
Status = SmpParseCommandLine(PageFileToken,
101101
NULL,
102102
&PageFileName,
@@ -212,7 +212,7 @@ SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken)
212212
/* This means no duplicates exist, so insert our descriptor! */
213213
InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry);
214214
SmpNumberOfPagingFiles++;
215-
DPRINT1("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n",
215+
DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n",
216216
PageFileToken, &Descriptor->Name);
217217
return STATUS_SUCCESS;
218218
}
@@ -241,7 +241,7 @@ SmpGetPagingFileSize(IN PUNICODE_STRING FileName,
241241
HANDLE FileHandle;
242242
FILE_STANDARD_INFORMATION StandardInfo;
243243

244-
DPRINT1("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName);
244+
DPRINT("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName);
245245
Size->QuadPart = 0;
246246

247247
InitializeObjectAttributes(&ObjectAttributes,
@@ -350,7 +350,7 @@ SmpGetVolumeFreeSpace(IN PSMP_VOLUME_DESCRIPTOR Volume)
350350
VolumeName.Length = wcslen(PathString) * sizeof(WCHAR);
351351
VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL);
352352
VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter;
353-
DPRINT1("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName);
353+
DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName);
354354

355355
/* Open the volume */
356356
InitializeObjectAttributes(&ObjectAttributes,
@@ -395,10 +395,6 @@ SmpGetVolumeFreeSpace(IN PSMP_VOLUME_DESCRIPTOR Volume)
395395
SizeInfo.SectorsPerAllocationUnit;
396396
FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector;
397397
Volume->FreeSpace = FinalFreeSpace;
398-
DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n",
399-
SizeInfo.AvailableAllocationUnits.QuadPart,
400-
SizeInfo.SectorsPerAllocationUnit,
401-
SizeInfo.BytesPerSector);
402398

403399
/* Check if there's less than 32MB free so we don't starve the disk */
404400
if (FinalFreeSpace.QuadPart <= 0x2000000)
@@ -460,7 +456,7 @@ SmpCreatePagingFile(IN PUNICODE_STRING Name,
460456
Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority);
461457
if (NT_SUCCESS(Status))
462458
{
463-
DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n",
459+
DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n",
464460
Name,
465461
MinSize->QuadPart,
466462
MaxSize->QuadPart);
@@ -508,7 +504,7 @@ SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor,
508504
if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED))
509505
{
510506
/* Try to find a crash dump and extract it */
511-
DPRINT1("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n",
507+
DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n",
512508
&Descriptor->Name);
513509
SmpCheckForCrashDump(&Descriptor->Name);
514510

@@ -521,7 +517,7 @@ SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor,
521517
}
522518
else
523519
{
524-
DPRINT1("Queried free space for boot volume `%wC: %I64x'\n",
520+
DPRINT("Queried free space for boot volume `%wC: %I64x'\n",
525521
Volume->DriveLetter, Volume->FreeSpace.QuadPart);
526522
}
527523

@@ -532,7 +528,7 @@ SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor,
532528
else
533529
{
534530
/* Crashdumps can only be on the boot volume */
535-
DPRINT1("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot"
531+
DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot"
536532
"volume `%wC' \n",
537533
&Descriptor->Name,
538534
Volume->DriveLetter);
@@ -545,10 +541,10 @@ SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor,
545541
/* Check how big we can make the pagefile */
546542
Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize);
547543
if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE;
548-
DPRINT1("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n",
544+
DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n",
549545
PageFileSize,
550546
&Descriptor->Name);
551-
DPRINT1("SMSS:PFILE: Free space on volume `%wC' is %I64X \n",
547+
DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n",
552548
Volume->DriveLetter,
553549
Volume->FreeSpace.QuadPart);
554550

@@ -562,7 +558,7 @@ SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor,
562558
{
563559
Descriptor->ActualMaxSize = PageFileSize;
564560
}
565-
DPRINT1("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n",
561+
DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n",
566562
Descriptor->ActualMinSize.QuadPart,
567563
Descriptor->ActualMaxSize.QuadPart,
568564
MinimumSize->QuadPart);
@@ -697,7 +693,7 @@ SmpValidatePagingFileSizes(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor)
697693
/* Capture the min and max */
698694
MinSize = Descriptor->MinSize.QuadPart;
699695
MaxSize = Descriptor->MaxSize.QuadPart;
700-
DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n",
696+
DPRINT("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n",
701697
&Descriptor->Name, MinSize, MaxSize);
702698

703699
/* Don't let minimum be bigger than maximum */
@@ -732,7 +728,7 @@ SmpValidatePagingFileSizes(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor)
732728
if (WasTooBig)
733729
{
734730
/* Notify debugger output and write a flag in the descriptor */
735-
DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n",
731+
DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n",
736732
&Descriptor->Name);
737733
Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG;
738734
}
@@ -972,10 +968,6 @@ SmpCreateVolumeDescriptors(VOID)
972968
SizeInfo.SectorsPerAllocationUnit;
973969
FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector;
974970
Volume->FreeSpace = FinalFreeSpace;
975-
DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n",
976-
SizeInfo.AvailableAllocationUnits.QuadPart,
977-
SizeInfo.SectorsPerAllocationUnit,
978-
SizeInfo.BytesPerSector);
979971

980972
/* Check if there's less than 32MB free so we don't starve the disk */
981973
if (FinalFreeSpace.QuadPart <= 0x2000000)
@@ -992,7 +984,7 @@ SmpCreateVolumeDescriptors(VOID)
992984
/* All done, add this volume to our descriptor list */
993985
InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry);
994986
Volume->Flags |= SMP_VOLUME_INSERTED;
995-
DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath);
987+
DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath);
996988
}
997989

998990
/* We must've found at least the boot volume */
@@ -1045,7 +1037,7 @@ SmpCreatePagingFiles(VOID)
10451037
if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED)
10461038
{
10471039
/* This is a system-managed descriptor. Create the correct file */
1048-
DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n",
1040+
DPRINT("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n",
10491041
&Descriptor->Name);
10501042
Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE);
10511043
if (!NT_SUCCESS(Status))
@@ -1062,7 +1054,7 @@ SmpCreatePagingFiles(VOID)
10621054
SmpValidatePagingFileSizes(Descriptor);
10631055

10641056
/* Check if this is an ANY pagefile or a FIXED pagefile */
1065-
DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n",
1057+
DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n",
10661058
&Descriptor->Name);
10671059
if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?')
10681060
{

‎base/system/smss2/smloop.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,12 @@ SmpHandleConnectionRequest(IN HANDLE SmApiPort,
204204
if (SbApiMsg->h.ClientId.UniqueProcess == SmUniqueProcessId)
205205
{
206206
/* No need to get any handle -- assume session 0 */
207-
DPRINT1("SM connecting to SM\n");
208207
ProcessHandle = NULL;
209208
SessionId = 0;
210209
}
211210
else
212211
{
213212
/* Reference the foreign process */
214-
DPRINT1("Incoming request from %lx\n", SbApiMsg->h.ClientId.UniqueProcess);
215213
InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
216214
Status = NtOpenProcess(&ProcessHandle,
217215
PROCESS_QUERY_INFORMATION,
@@ -274,7 +272,6 @@ SmpHandleConnectionRequest(IN HANDLE SmApiPort,
274272

275273
/* Now send the actual accept reply (which could be a rejection) */
276274
PortView.Length = sizeof(PortView);
277-
DPRINT1("Accepting: %d connection with context: %p\n", Accept, ClientContext);
278275
Status = NtAcceptConnectPort(&PortHandle,
279276
ClientContext,
280277
&SbApiMsg->h,
@@ -303,7 +300,6 @@ SmpHandleConnectionRequest(IN HANDLE SmApiPort,
303300
SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL;
304301
RtlCreateUnicodeString(&SubsystemPort,
305302
SbApiMsg->ConnectionInfo.SbApiPortName);
306-
DPRINT1("Connecting back to %wZ\n", &SubsystemPort);
307303
Status = NtConnectPort(&CidSubsystem->SbApiPort,
308304
&SubsystemPort,
309305
&SecurityQos,
@@ -363,7 +359,6 @@ SmpApiLoop(IN PVOID Parameter)
363359
while (TRUE)
364360
{
365361
/* Begin waiting on a request */
366-
DPRINT1("API Loop: %p\n", SmApiPort);
367362
Status = NtReplyWaitReceivePort(SmApiPort,
368363
(PVOID*)&ClientContext,
369364
&ReplyMsg->h,
@@ -383,7 +378,6 @@ SmpApiLoop(IN PVOID Parameter)
383378
/* A new connection */
384379
case LPC_CONNECTION_REQUEST:
385380
/* Create the right structures for it */
386-
DPRINT1("New connection request\n");
387381
SmpHandleConnectionRequest(SmApiPort, (PSB_API_MSG)&RequestMsg);
388382
ReplyMsg = NULL;
389383
break;
@@ -423,7 +417,6 @@ SmpApiLoop(IN PVOID Parameter)
423417
else
424418
{
425419
/* It's totally okay, so call the dispatcher for it */
426-
DPRINT1("Calling dispatcher for ID: %lx\n", RequestMsg.ApiNumber);
427420
Status = SmpApiDispatch[RequestMsg.ApiNumber](&RequestMsg,
428421
ClientContext,
429422
SmApiPort);

‎base/system/smss2/smss.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ SmpExecuteImage(IN PUNICODE_STRING FileName,
4747
NTSTATUS Status;
4848
RTL_USER_PROCESS_INFORMATION LocalProcessInfo;
4949
PRTL_USER_PROCESS_PARAMETERS ProcessParameters;
50-
DPRINT1("Executing image: %wZ\n", FileName);
5150

5251
/* Use the input process information if we have it, otherwise use local */
5352
ProcessInfo = ProcessInformation;

0 commit comments

Comments
 (0)