huwcampbell.com / reactos
Reactos
fork atom

[USETUP] Minor formatting only.

Hermès Bélusca-Maïto 66302e47 0733d96d

+155 -174
+141 -163
base/setup/usetup/consup.c
··· 42 42 /* FUNCTIONS *****************************************************************/ 43 43 44 44 BOOLEAN 45 - CONSOLE_Init( 46 - VOID) 45 + CONSOLE_Init(VOID) 47 46 { 48 47 CONSOLE_SCREEN_BUFFER_INFO csbi; 49 48 if (!AllocConsole()) ··· 108 107 { 109 108 DWORD Written; 110 109 111 - WriteConsole( 112 - StdOutput, 113 - &c, 114 - 1, 115 - &Written, 116 - NULL); 110 + WriteConsole(StdOutput, 111 + &c, 112 + 1, 113 + &Written, 114 + NULL); 117 115 } 118 116 119 117 VOID ··· 122 120 { 123 121 DWORD Written; 124 122 125 - WriteConsole( 126 - StdOutput, 127 - szText, 128 - (ULONG)strlen(szText), 129 - &Written, 130 - NULL); 131 - WriteConsole( 132 - StdOutput, 133 - "\n", 134 - 1, 135 - &Written, 136 - NULL); 123 + WriteConsole(StdOutput, 124 + szText, 125 + (ULONG)strlen(szText), 126 + &Written, 127 + NULL); 128 + WriteConsole(StdOutput, 129 + "\n", 130 + 1, 131 + &Written, 132 + NULL); 137 133 } 138 134 139 135 VOID ··· 146 142 147 143 vsprintf(szOut, szFormat, args); 148 144 149 - WriteConsole( 150 - StdOutput, 151 - szOut, 152 - (ULONG)strlen(szOut), 153 - &dwWritten, 154 - NULL); 145 + WriteConsole(StdOutput, 146 + szOut, 147 + (ULONG)strlen(szOut), 148 + &dwWritten, 149 + NULL); 155 150 } 156 151 157 152 VOID ··· 175 170 176 171 VOID 177 172 CONSOLE_GetCursorXY( 178 - PSHORT x, 179 - PSHORT y) 173 + OUT PSHORT x, 174 + OUT PSHORT y) 180 175 { 181 176 CONSOLE_SCREEN_BUFFER_INFO csbi; 182 177 ··· 240 235 coPos.X = 0; 241 236 coPos.Y = 0; 242 237 243 - FillConsoleOutputAttribute( 244 - StdOutput, 245 - FOREGROUND_WHITE | BACKGROUND_BLUE, 246 - xScreen * yScreen, 247 - coPos, 248 - &Written); 238 + FillConsoleOutputAttribute(StdOutput, 239 + FOREGROUND_WHITE | BACKGROUND_BLUE, 240 + xScreen * yScreen, 241 + coPos, 242 + &Written); 249 243 250 - FillConsoleOutputCharacterA( 251 - StdOutput, 252 - ' ', 253 - xScreen * yScreen, 254 - coPos, 255 - &Written); 244 + FillConsoleOutputCharacterA(StdOutput, 245 + ' ', 246 + xScreen * yScreen, 247 + coPos, 248 + &Written); 256 249 } 257 250 258 251 VOID ··· 269 262 { 270 263 coPos.X = x; 271 264 272 - FillConsoleOutputAttribute( 273 - StdOutput, 274 - FOREGROUND_BLUE | BACKGROUND_WHITE, 275 - col, 276 - coPos, 277 - &Written); 265 + FillConsoleOutputAttribute(StdOutput, 266 + FOREGROUND_BLUE | BACKGROUND_WHITE, 267 + col, 268 + coPos, 269 + &Written); 278 270 } 279 271 } 280 272 ··· 292 284 { 293 285 coPos.X = x; 294 286 295 - FillConsoleOutputAttribute( 296 - StdOutput, 297 - FOREGROUND_WHITE | BACKGROUND_BLUE, 298 - col, 299 - coPos, 300 - &Written); 287 + FillConsoleOutputAttribute(StdOutput, 288 + FOREGROUND_WHITE | BACKGROUND_BLUE, 289 + col, 290 + coPos, 291 + &Written); 301 292 } 302 293 } 303 294 ··· 313 304 coPos.X = x; 314 305 coPos.Y = y; 315 306 316 - WriteConsoleOutputCharacterA( 317 - StdOutput, 318 - Text, 319 - (ULONG)strlen(Text), 320 - coPos, 321 - &Written); 307 + WriteConsoleOutputCharacterA(StdOutput, 308 + Text, 309 + (ULONG)strlen(Text), 310 + coPos, 311 + &Written); 322 312 } 323 313 324 314 VOID ··· 357 347 if (Length > len - 1) 358 348 Length = len - 1; 359 349 360 - FillConsoleOutputAttribute( 361 - StdOutput, 362 - BACKGROUND_WHITE, 363 - len, 364 - coPos, 365 - &Written); 350 + FillConsoleOutputAttribute(StdOutput, 351 + BACKGROUND_WHITE, 352 + len, 353 + coPos, 354 + &Written); 366 355 367 - WriteConsoleOutputCharacterW( 368 - StdOutput, 369 - Text, 370 - (ULONG)Length, 371 - coPos, 372 - &Written); 356 + WriteConsoleOutputCharacterW(StdOutput, 357 + Text, 358 + (ULONG)Length, 359 + coPos, 360 + &Written); 373 361 374 362 coPos.X += Length; 375 363 if (len > Length) 376 364 { 377 - FillConsoleOutputCharacterA( 378 - StdOutput, 379 - ' ', 380 - len - Length, 381 - coPos, 382 - &Written); 365 + FillConsoleOutputCharacterA(StdOutput, 366 + ' ', 367 + len - Length, 368 + coPos, 369 + &Written); 383 370 } 384 371 } 385 372 ··· 398 385 399 386 Length = (ULONG)strlen(Text); 400 387 401 - WriteConsoleOutputCharacterA( 402 - StdOutput, 403 - Text, 404 - Length, 405 - coPos, 406 - &Written); 388 + WriteConsoleOutputCharacterA(StdOutput, 389 + Text, 390 + Length, 391 + coPos, 392 + &Written); 407 393 408 394 coPos.Y++; 409 - FillConsoleOutputCharacterA( 410 - StdOutput, 411 - 0xCD, 412 - Length, 413 - coPos, 414 - &Written); 395 + FillConsoleOutputCharacterA(StdOutput, 396 + 0xCD, 397 + Length, 398 + coPos, 399 + &Written); 415 400 } 416 401 417 402 VOID ··· 429 414 coPos.X = 0; 430 415 coPos.Y = yScreen - 1; 431 416 432 - FillConsoleOutputAttribute( 433 - StdOutput, 434 - BACKGROUND_WHITE, 435 - xScreen, 436 - coPos, 437 - &Written); 417 + FillConsoleOutputAttribute(StdOutput, 418 + BACKGROUND_WHITE, 419 + xScreen, 420 + coPos, 421 + &Written); 438 422 439 - FillConsoleOutputCharacterA( 440 - StdOutput, 441 - ' ', 442 - xScreen, 443 - coPos, 444 - &Written); 423 + FillConsoleOutputCharacterA(StdOutput, 424 + ' ', 425 + xScreen, 426 + coPos, 427 + &Written); 445 428 446 429 coPos.X = x; 447 430 448 - WriteConsoleOutputCharacterA( 449 - StdOutput, 450 - Buffer, 451 - (ULONG)strlen(Buffer), 452 - coPos, 453 - &Written); 431 + WriteConsoleOutputCharacterA(StdOutput, 432 + Buffer, 433 + (ULONG)strlen(Buffer), 434 + coPos, 435 + &Written); 454 436 } 455 437 456 438 VOID ··· 490 472 491 473 static 492 474 VOID 493 - CONSOLE_ClearStatusTextX(IN SHORT x, 494 - IN SHORT Length) 475 + CONSOLE_ClearStatusTextX( 476 + IN SHORT x, 477 + IN SHORT Length) 495 478 { 496 479 COORD coPos; 497 480 DWORD Written; ··· 505 488 coPos, 506 489 &Written); 507 490 } 508 - 509 491 510 492 VOID 511 493 __cdecl 512 494 CONSOLE_SetStatusTextAutoFitX( 513 495 IN SHORT x, 514 - IN LPCSTR fmt, ...) 496 + IN LPCSTR fmt, 497 + ...) 515 498 { 516 499 CHAR Buffer[128]; 517 500 DWORD Length; ··· 525 508 526 509 if (Length + x <= 79) 527 510 { 528 - CONSOLE_SetStatusTextX (x , Buffer); 511 + CONSOLE_SetStatusTextX(x , Buffer); 529 512 } 530 513 else 531 514 { 532 - CONSOLE_SetStatusTextX (79 - Length , Buffer); 515 + CONSOLE_SetStatusTextX(79 - Length , Buffer); 533 516 } 534 517 } 535 518 ··· 548 531 549 532 Length = (ULONG)strlen(Text); 550 533 551 - FillConsoleOutputAttribute( 552 - StdOutput, 553 - FOREGROUND_BLUE | BACKGROUND_WHITE, 554 - Length, 555 - coPos, 556 - &Written); 534 + FillConsoleOutputAttribute(StdOutput, 535 + FOREGROUND_BLUE | BACKGROUND_WHITE, 536 + Length, 537 + coPos, 538 + &Written); 557 539 558 - WriteConsoleOutputCharacterA( 559 - StdOutput, 560 - Text, 561 - Length, 562 - coPos, 563 - &Written); 540 + WriteConsoleOutputCharacterA(StdOutput, 541 + Text, 542 + Length, 543 + coPos, 544 + &Written); 564 545 } 565 546 566 547 VOID ··· 578 559 579 560 Length = (ULONG)strlen(Text); 580 561 581 - FillConsoleOutputAttribute( 582 - StdOutput, 583 - FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, 584 - Length, 585 - coPos, 586 - &Written); 562 + FillConsoleOutputAttribute(StdOutput, 563 + FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, 564 + Length, 565 + coPos, 566 + &Written); 587 567 588 - WriteConsoleOutputCharacterA( 589 - StdOutput, 590 - Text, 591 - Length, 592 - coPos, 593 - &Written); 568 + WriteConsoleOutputCharacterA(StdOutput, 569 + Text, 570 + Length, 571 + coPos, 572 + &Written); 594 573 } 595 574 596 575 VOID ··· 598 577 CONSOLE_PrintTextXY( 599 578 IN SHORT x, 600 579 IN SHORT y, 601 - IN LPCSTR fmt, ...) 580 + IN LPCSTR fmt, 581 + ...) 602 582 { 603 583 CHAR buffer[512]; 604 584 va_list ap; ··· 612 592 coPos.X = x; 613 593 coPos.Y = y; 614 594 615 - WriteConsoleOutputCharacterA( 616 - StdOutput, 617 - buffer, 618 - (ULONG)strlen(buffer), 619 - coPos, 620 - &Written); 595 + WriteConsoleOutputCharacterA(StdOutput, 596 + buffer, 597 + (ULONG)strlen(buffer), 598 + coPos, 599 + &Written); 621 600 } 622 601 623 602 VOID ··· 626 605 IN SHORT x, 627 606 IN SHORT y, 628 607 IN SHORT len, 629 - IN LPCSTR fmt, ...) 608 + IN LPCSTR fmt, 609 + ...) 630 610 { 631 611 CHAR buffer[512]; 632 612 va_list ap; ··· 645 625 if (Length > len - 1) 646 626 Length = len - 1; 647 627 648 - WriteConsoleOutputCharacterA( 649 - StdOutput, 650 - buffer, 651 - Length, 652 - coPos, 653 - &Written); 628 + WriteConsoleOutputCharacterA(StdOutput, 629 + buffer, 630 + Length, 631 + coPos, 632 + &Written); 654 633 655 634 coPos.X += Length; 656 635 657 636 if (len > Length) 658 637 { 659 - FillConsoleOutputCharacterA( 660 - StdOutput, 661 - ' ', 662 - len - Length, 663 - coPos, 664 - &Written); 638 + FillConsoleOutputCharacterA(StdOutput, 639 + ' ', 640 + len - Length, 641 + coPos, 642 + &Written); 665 643 } 666 644 } 667 645 ··· 693 671 694 672 if (Flags & TEXT_ALIGN_CENTER) 695 673 { 696 - coPos.X = (xScreen - Length) /2; 674 + coPos.X = (xScreen - Length) / 2; 697 675 } 698 676 else if(Flags & TEXT_ALIGN_RIGHT) 699 677 { ··· 749 727 } 750 728 } 751 729 752 - 753 730 VOID 754 - CONSOLE_ClearStyledText(IN SHORT x, 755 - IN SHORT y, 756 - IN INT Flags, 757 - IN SHORT Length) 731 + CONSOLE_ClearStyledText( 732 + IN SHORT x, 733 + IN SHORT y, 734 + IN INT Flags, 735 + IN SHORT Length) 758 736 { 759 737 COORD coPos; 760 738 ··· 774 752 775 753 if (Flags & TEXT_ALIGN_CENTER) 776 754 { 777 - coPos.X = (xScreen - Length) /2; 755 + coPos.X = (xScreen - Length) / 2; 778 756 } 779 757 else if(Flags & TEXT_ALIGN_RIGHT) 780 758 {
+14 -11
base/setup/usetup/consup.h
··· 54 54 extern SHORT xScreen, yScreen; 55 55 56 56 BOOLEAN 57 - CONSOLE_Init( 58 - VOID); 57 + CONSOLE_Init(VOID); 59 58 60 59 VOID 61 60 CONSOLE_ClearScreen(VOID); ··· 92 91 93 92 VOID 94 93 CONSOLE_GetCursorXY( 95 - PSHORT x, 96 - PSHORT y); 94 + OUT PSHORT x, 95 + OUT PSHORT y); 97 96 98 97 SHORT 99 98 CONSOLE_GetCursorX(VOID); ··· 120 119 CONSOLE_PrintTextXY( 121 120 IN SHORT x, 122 121 IN SHORT y, 123 - IN LPCSTR fmt, ...); 122 + IN LPCSTR fmt, 123 + ...); 124 124 125 125 VOID 126 126 __cdecl ··· 128 128 IN SHORT x, 129 129 IN SHORT y, 130 130 IN SHORT len, 131 - IN LPCSTR fmt, ...); 131 + IN LPCSTR fmt, 132 + ...); 132 133 133 134 VOID 134 135 CONSOLE_SetCursorType( ··· 192 193 __cdecl 193 194 CONSOLE_SetStatusTextAutoFitX( 194 195 IN SHORT x, 195 - IN LPCSTR fmt, ...); 196 + IN LPCSTR fmt, 197 + ...); 196 198 197 199 VOID 198 200 CONSOLE_SetTextXY( ··· 220 222 IN LPCSTR Text); 221 223 222 224 VOID 223 - CONSOLE_ClearStyledText(IN SHORT x, 224 - IN SHORT y, 225 - IN INT Flags, 226 - IN SHORT Length); 225 + CONSOLE_ClearStyledText( 226 + IN SHORT x, 227 + IN SHORT y, 228 + IN INT Flags, 229 + IN SHORT Length); 227 230 228 231 /* EOF */