Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[phater] 73120: [MSAFD] Disable setting blocking mode if there are WSPAsyncSelect or WSPEventSelect pending calls. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Fri Nov 4 09:38:21 2016 New Revision: 73120 URL: http://svn.reactos.org/svn/reactos?rev=73120&view=rev Log: [MSAFD] Disable setting blocking mode if there are WSPAsyncSelect or WSPEventSelect pending calls. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Nov 4 09:38:21 2016 @@ -2264,6 +2264,22 @@ break; } NonBlocking = *((PULONG)lpvInBuffer) ? TRUE : FALSE; + /* Don't allow to go in blocking mode if WSPAsyncSelect or WSPEventSelect is pending */ + if (!NonBlocking) + { + /* If there is an WSPAsyncSelect pending, fail with WSAEINVAL */ + if (Socket->SharedData->AsyncEvents & (~Socket->SharedData->AsyncDisabledEvents)) + { + Errno = WSAEINVAL; + break; + } + /* If there is an WSPEventSelect pending, fail with WSAEINVAL */ + if (Socket->NetworkEvents) + { + Errno = WSAEINVAL; + break; + } + } Socket->SharedData->NonBlocking = NonBlocking ? 1 : 0; NeedsCompletion = FALSE; Errno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &NonBlocking, NULL, NULL, lpOverlapped, lpCompletionRoutine);

7 years, 11 months

[akhaldi] 73119: [0.4.3] * Merge FstubReadPartitionTableEFI() fix by Pierre in r73112. CORE-12261

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 4 09:33:03 2016 New Revision: 73119 URL: http://svn.reactos.org/svn/reactos?rev=73119&view=rev Log: [0.4.3] * Merge FstubReadPartitionTableEFI() fix by Pierre in r73112. CORE-12261 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:33:03 2016 @@ -1 +1 @@ -/trunk:73043,73072,73075,73077,73113-73114,73117 +/trunk:73043,73072,73075,73077,73112-73114,73117 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:33:03 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73072,73075,73077,73113-73114,73117 +/trunk/reactos:73043,73072,73075,73077,73112-73114,73117 Modified: branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Fri Nov 4 09:33:03 2016 @@ -963,8 +963,12 @@ ULONG NumberOfEntries; PEFI_PARTITION_HEADER EfiHeader; EFI_PARTITION_ENTRY PartitionEntry; +#if 0 BOOLEAN UpdatedPartitionTable = FALSE; ULONGLONG SectorsForPartitions, PartitionEntryLBA; +#else + ULONGLONG PartitionEntryLBA; +#endif PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector; PAGED_CODE(); @@ -996,6 +1000,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } +#if 0 if (!ReadBackupTable) { /* If we weren't ask to read backup table, @@ -1015,6 +1020,7 @@ UpdatedPartitionTable = TRUE; } } +#endif DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT; /* Translate LBA -> Offset */ @@ -1083,12 +1089,14 @@ } DriveLayoutEx->PartitionCount = PartitionCount; +#if 0 /* If we updated partition table using backup table, rewrite partition table */ if (UpdatedPartitionTable) { IoWritePartitionTableEx(Disk->DeviceObject, DriveLayoutEx); } +#endif /* Finally, return read data */ *DriveLayout = DriveLayoutEx;

7 years, 11 months

[akhaldi] 73118: [0.4.3] * Merge netcfgx changes by Doug in r73117. CORE-12094

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 4 09:30:13 2016 New Revision: 73118 URL: http://svn.reactos.org/svn/reactos?rev=73118&view=rev Log: [0.4.3] * Merge netcfgx changes by Doug in r73117. CORE-12094 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/bg-BG.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/cs-CZ.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/da-DK.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/de-DE.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/el-GR.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/en-US.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/fr-FR.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/he-IL.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/hu-HU.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/id-ID.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/it-IT.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ja-JP.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/nl-NL.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/no-NO.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/pl-PL.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ro-RO.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ru-RU.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sk-SK.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sq-AL.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sv-SE.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/tr-TR.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/uk-UA.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/zh-CN.rc branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… Modified: branches/ros-branch-0_4_3/reactos/dll/win32/netcfgx/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi…

7 years, 11 months

[akhaldi] 73117: [NETCFGX] Compensate for the proper widths until we have sane font support. Suggestion by Jim, patch by Doug Lyons. CORE-12094

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 4 09:28:44 2016 New Revision: 73117 URL: http://svn.reactos.org/svn/reactos?rev=73117&view=rev Log: [NETCFGX] Compensate for the proper widths until we have sane font support. Suggestion by Jim, patch by Doug Lyons. CORE-12094 Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-… Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sq-… Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-… Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-…

7 years, 11 months

[akhaldi] 73116: [0.4.3] * Merge IoWritePartitionTableEx() fix by Pierre in r73114. CORE-12261

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 4 09:17:52 2016 New Revision: 73116 URL: http://svn.reactos.org/svn/reactos?rev=73116&view=rev Log: [0.4.3] * Merge IoWritePartitionTableEx() fix by Pierre in r73114. CORE-12261 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:17:52 2016 @@ -1 +1 @@ -/trunk:73043,73072,73075,73077,73113 +/trunk:73043,73072,73075,73077,73113-73114 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:17:52 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73072,73075,73077,73113 +/trunk/reactos:73043,73072,73075,73077,73113-73114 Modified: branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Fri Nov 4 09:17:52 2016 @@ -2501,6 +2501,10 @@ DriveLayout->PartitionEntry); } } + else + { + Status = STATUS_INVALID_PARAMETER; + } } break;

7 years, 11 months

[akhaldi] 73115: [0.4.3] * Merge disk size computing overflow fix by Vort in r73113. CORE-12261

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 4 09:16:15 2016 New Revision: 73115 URL: http://svn.reactos.org/svn/reactos?rev=73115&view=rev Log: [0.4.3] * Merge disk size computing overflow fix by Vort in r73113. CORE-12261 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:16:15 2016 @@ -1 +1 @@ -/trunk:73043,73072,73075,73077 +/trunk:73043,73072,73075,73077,73113 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 4 09:16:15 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73072,73075,73077 +/trunk/reactos:73043,73072,73075,73077,73113 Modified: branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Fri Nov 4 09:16:15 2016 @@ -4283,7 +4283,7 @@ DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack; DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder; DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)cylinders; - DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders * tracksPerCylinder * sectorsPerTrack * + DeviceExtension->DiskGeometry->DiskSize.QuadPart = (LONGLONG)cylinders * tracksPerCylinder * sectorsPerTrack * DeviceExtension->DiskGeometry->Geometry.BytesPerSector; DebugPrint((3,

7 years, 11 months

[pschweitzer] 73114: [NTOSKRNL] In IoWritePartitionTableEx(), don't return STATUS_SUCCESS when we cannot write GPT to higher partitions count than space available; return STATUS_INVALID_PARAMETER.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 3 21:49:55 2016 New Revision: 73114 URL: http://svn.reactos.org/svn/reactos?rev=73114&view=rev Log: [NTOSKRNL] In IoWritePartitionTableEx(), don't return STATUS_SUCCESS when we cannot write GPT to higher partitions count than space available; return STATUS_INVALID_PARAMETER. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Nov 3 21:49:55 2016 @@ -2509,6 +2509,10 @@ DriveLayout->PartitionEntry); } } + else + { + Status = STATUS_INVALID_PARAMETER; + } } break;

7 years, 11 months

[pschweitzer] 73113: [DISK] Don't overflow when computing disk size. Patch by Vort. CORE-12261

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 3 21:38:56 2016 New Revision: 73113 URL: http://svn.reactos.org/svn/reactos?rev=73113&view=rev Log: [DISK] Don't overflow when computing disk size. Patch by Vort. CORE-12261 Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Thu Nov 3 21:38:56 2016 @@ -4283,7 +4283,7 @@ DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack; DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder; DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)cylinders; - DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders * tracksPerCylinder * sectorsPerTrack * + DeviceExtension->DiskGeometry->DiskSize.QuadPart = (LONGLONG)cylinders * tracksPerCylinder * sectorsPerTrack * DeviceExtension->DiskGeometry->Geometry.BytesPerSector; DebugPrint((3,

7 years, 11 months

[pschweitzer] 73112: [NTOSKRNL] For now, disable broken code in FstubReadPartitionTableEFI(). In its current state, it wrongly assumes backup GPT is broken and thus attempts to fix main GPT (?!). F...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Nov 3 21:13:30 2016 New Revision: 73112 URL: http://svn.reactos.org/svn/reactos?rev=73112&view=rev Log: [NTOSKRNL] For now, disable broken code in FstubReadPartitionTableEFI(). In its current state, it wrongly assumes backup GPT is broken and thus attempts to fix main GPT (?!). Furthermore, it appears Windows 2K3 doesn't perform such checks, nor such GPT rewritings in FstubReadPartitionTableEFI(). CORE-12261 Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Nov 3 21:13:30 2016 @@ -963,8 +963,12 @@ ULONG NumberOfEntries; PEFI_PARTITION_HEADER EfiHeader; EFI_PARTITION_ENTRY PartitionEntry; +#if 0 BOOLEAN UpdatedPartitionTable = FALSE; ULONGLONG SectorsForPartitions, PartitionEntryLBA; +#else + ULONGLONG PartitionEntryLBA; +#endif PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector; PAGED_CODE(); @@ -996,6 +1000,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } +#if 0 if (!ReadBackupTable) { /* If we weren't ask to read backup table, @@ -1015,6 +1020,7 @@ UpdatedPartitionTable = TRUE; } } +#endif DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT; /* Translate LBA -> Offset */ @@ -1083,12 +1089,14 @@ } DriveLayoutEx->PartitionCount = PartitionCount; +#if 0 /* If we updated partition table using backup table, rewrite partition table */ if (UpdatedPartitionTable) { IoWritePartitionTableEx(Disk->DeviceObject, DriveLayoutEx); } +#endif /* Finally, return read data */ *DriveLayout = DriveLayoutEx;

7 years, 11 months

[hbelusca] 73111: [WHOAMI]: Use the conutils (stream) library for console output (see also r65894). CORE-8965 CORE-10504

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Nov 3 16:30:48 2016 New Revision: 73111 URL: http://svn.reactos.org/svn/reactos?rev=73111&view=rev Log: [WHOAMI]: Use the conutils (stream) library for console output (see also r65894). CORE-8965 CORE-10504 Modified: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt trunk/reactos/base/applications/cmdutils/whoami/whoami.c Modified: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt [iso-8859-1] Thu Nov 3 16:30:48 2016 @@ -1,5 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(whoami whoami.c whoami.rc) set_module_type(whoami win32cui UNICODE) +target_link_libraries(whoami conutils ${PSEH_LIB}) add_importlibs(whoami user32 secur32 advapi32 msvcrt kernel32) add_cd_file(TARGET whoami DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Thu Nov 3 16:30:48 2016 @@ -6,69 +6,16 @@ * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) */ - #define SECURITY_WIN32 #include <security.h> #include <sddl.h> - #include <strsafe.h> +#include <conutils.h> + #include "resource.h" - -/* Unicode (W) to ANSI OEM wrapper function, as console and Unicode don't mix well, sigh */ -static void WhoamiOemConversion_printf(const WCHAR *lpSourceFormatW, ...) -{ - CHAR *lpBufferA = NULL; - WCHAR *lpBufferW = NULL; - - UINT Size; - va_list Args; - - /* first let's find out the final output'ed length of the wprintf routine */ - va_start(Args, lpSourceFormatW); - - Size = _vscwprintf(lpSourceFormatW, Args); - - va_end(Args); - - /* allocate a proportional memory chunk taking into account the char width */ - lpBufferW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(WCHAR)); - - if (!lpBufferW) - return; - - /* do wprintf to this newly allocated buffer of ours */ - va_start(Args, lpSourceFormatW); - - _vsnwprintf(lpBufferW, Size, lpSourceFormatW, Args); - - va_end(Args); - - /* allocate a similarly sized buffer for the ANSI/OEM version of our string */ - lpBufferA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(CHAR)); - - if (!lpBufferA) - { - HeapFree(GetProcessHeap(), 0, lpBufferW); - return; - } - - /* convert our Unicode/Wide char string into a proper ANSI/OEM - string that our console may understand, at least in theory */ - CharToOemBuffW(lpBufferW, - lpBufferA, - Size); - - /* print the converted OEM string into the console's output and call it a day */ - printf("%s", lpBufferA); - - /* clean everything up */ - HeapFree(GetProcessHeap(), 0, lpBufferW); - HeapFree(GetProcessHeap(), 0, lpBufferA); -} - -#define wprintf WhoamiOemConversion_printf +#define wprintf(...) ConPrintf(StdOut, ##__VA_ARGS__) BOOL NoHeader = FALSE; UINT NoHeaderArgCount = 0; @@ -194,7 +141,6 @@ while (Length--) wprintf(L"-"); - /* _putws seems to be broken in ReactOS' CRT ??? */ wprintf(L"\n\n"); } @@ -718,12 +664,15 @@ int wmain(int argc, WCHAR* argv[]) { - INT i; - BYTE WamBit = 0; - #define WAM_USER 1<<0 #define WAM_GROUPS 1<<1 #define WAM_PRIV 1<<2 + + INT i; + BYTE WamBit = 0; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); /* * * * * * * * * * * * * * * *

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016