Changeset 9429 for trunk/src/gdi32/font.cpp
- Timestamp:
- Nov 26, 2002, 11:53:12 AM (23 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gdi32/font.cpp
r8871 r9429 1 /* $Id: font.cpp,v 1.2 6 2002-07-15 10:02:28 sandervl Exp $ */1 /* $Id: font.cpp,v 1.27 2002-11-26 10:53:08 sandervl Exp $ */ 2 2 3 3 /* … … 147 147 //****************************************************************************** 148 148 //****************************************************************************** 149 ODINFUNCTIONNODBG14(HFONT, CreateFontA, int,nHeight,150 int,nWidth,151 int,nEscapement,152 int,nOrientation,153 int,fnWeight,154 DWORD,fdwItalic,155 DWORD,fdwUnderline,156 DWORD,fdwStrikeOut,157 DWORD,fdwCharSet,158 DWORD,fdwOutputPrecision,159 DWORD,fdwClipPrecision,160 DWORD,fdwQuality,161 DWORD,fdwPitchAndFamily,162 LPCSTR,lpszFace)149 HFONT WIN32API CreateFontA(int nHeight, 150 int nWidth, 151 int nEscapement, 152 int nOrientation, 153 int fnWeight, 154 DWORD fdwItalic, 155 DWORD fdwUnderline, 156 DWORD fdwStrikeOut, 157 DWORD fdwCharSet, 158 DWORD fdwOutputPrecision, 159 DWORD fdwClipPrecision, 160 DWORD fdwQuality, 161 DWORD fdwPitchAndFamily, 162 LPCSTR lpszFace) 163 163 { 164 164 CHAR lpstrFaceNew[LF_FACESIZE]; … … 201 201 //****************************************************************************** 202 202 //****************************************************************************** 203 ODINFUNCTIONNODBG14(HFONT, CreateFontW, 204 int, nHeight, 205 int, nWidth, 206 int, nEscapement, 207 int, nOrientation, 208 int, fnWeight, 209 DWORD, fdwItalic, 210 DWORD, fdwUnderline, 211 DWORD, fdwStrikeOut, 212 DWORD, fdwCharSet, 213 DWORD, fdwOutputPrecision, 214 DWORD, fdwClipPrecision, 215 DWORD, fdwQuality, 216 DWORD, fdwPitchAndFamily, 217 LPCWSTR,lpszFace) 203 HFONT WIN32API CreateFontW(int nHeight, 204 int nWidth, 205 int nEscapement, 206 int nOrientation, 207 int fnWeight, 208 DWORD fdwItalic, 209 DWORD fdwUnderline, 210 DWORD fdwStrikeOut, 211 DWORD fdwCharSet, 212 DWORD fdwOutputPrecision, 213 DWORD fdwClipPrecision, 214 DWORD fdwQuality, 215 DWORD fdwPitchAndFamily, 216 LPCWSTR lpszFace) 218 217 { 219 218 char *astring; … … 249 248 //****************************************************************************** 250 249 //****************************************************************************** 251 ODINFUNCTION1(HFONT,CreateFontIndirectA,const LOGFONTA*,lplf)250 HFONT WIN32API CreateFontIndirectA(const LOGFONTA* lplf) 252 251 { 253 252 HFONT hFont; … … 284 283 //****************************************************************************** 285 284 //****************************************************************************** 286 ODINFUNCTION1(HFONT, CreateFontIndirectW,const LOGFONTW *,lplf)285 HFONT WIN32API CreateFontIndirectW(const LOGFONTW * lplf) 287 286 { 288 287 LOGFONTA afont; … … 433 432 //****************************************************************************** 434 433 //****************************************************************************** 435 ODINFUNCTION4(int, EnumFontsA, 436 HDC, hdc, 437 LPCSTR, arg2, 438 FONTENUMPROCA, arg3, 439 LPARAM, arg4) 434 int WIN32API EnumFontsA(HDC hdc, 435 LPCSTR arg2, 436 FONTENUMPROCA arg3, 437 LPARAM arg4) 440 438 { 441 439 //@@@PH shouldn't this rather be O32_EnumFonts ? … … 444 442 //****************************************************************************** 445 443 //****************************************************************************** 446 ODINFUNCTION4(int, EnumFontsW, 447 HDC, hdc, 448 LPCWSTR, arg2, 449 FONTENUMPROCW, arg3, 450 LPARAM, arg4) 444 int WIN32API EnumFontsW(HDC hdc, 445 LPCWSTR arg2, 446 FONTENUMPROCW arg3, 447 LPARAM arg4) 451 448 { 452 449 //@@@PH shouldn't this rather be O32_EnumFonts ? … … 455 452 //****************************************************************************** 456 453 //****************************************************************************** 457 ODINFUNCTION4(int, EnumFontFamiliesA, 458 HDC, hdc, 459 LPCSTR, lpszFontFamily, 460 FONTENUMPROCA, arg3, 461 LPARAM, arg4) 454 int WIN32API EnumFontFamiliesA(HDC hdc, 455 LPCSTR lpszFontFamily, 456 FONTENUMPROCA arg3, 457 LPARAM arg4) 462 458 { 463 459 ENUMUSERDATA enumData; … … 478 474 //****************************************************************************** 479 475 //****************************************************************************** 480 ODINFUNCTION4(int, EnumFontFamiliesW, 481 HDC, hdc, 482 LPCWSTR, lpszFontFamilyW, 483 FONTENUMPROCW, arg3, 484 LPARAM, arg4) 476 int WIN32API EnumFontFamiliesW(HDC hdc, 477 LPCWSTR lpszFontFamilyW, 478 FONTENUMPROCW arg3, 479 LPARAM arg4) 485 480 { 486 481 CHAR lpstrFamilyNew[LF_FACESIZE] = ""; … … 503 498 //****************************************************************************** 504 499 //****************************************************************************** 505 ODINFUNCTION5(INT, EnumFontFamiliesExA, 506 HDC, hdc, 507 LPLOGFONTA, arg2, 508 FONTENUMPROCEXA, arg3, 509 LPARAM, arg4, 510 DWORD, dwFlags) 500 INT WIN32API EnumFontFamiliesExA(HDC hdc, 501 LPLOGFONTA arg2, 502 FONTENUMPROCEXA arg3, 503 LPARAM arg4, 504 DWORD dwFlags) 511 505 { 512 506 ENUMUSERDATA enumData; … … 525 519 //****************************************************************************** 526 520 //****************************************************************************** 527 ODINFUNCTION5(INT, EnumFontFamiliesExW, 528 HDC, hdc, 529 LPLOGFONTW, arg2, 530 FONTENUMPROCEXW, arg3, 531 LPARAM, arg4, 532 DWORD, dwFlags) 521 INT WIN32API EnumFontFamiliesExW(HDC hdc, 522 LPLOGFONTW arg2, 523 FONTENUMPROCEXW arg3, 524 LPARAM arg4, 525 DWORD dwFlags) 533 526 { 534 527 ENUMUSERDATA enumData; … … 549 542 //****************************************************************************** 550 543 //****************************************************************************** 551 ODINFUNCTION5(DWORD, GetFontData, 552 HDC, hdc, 553 DWORD, dwTable, 554 DWORD, dwOffset, 555 LPVOID, lpvBuffer, 556 DWORD, dbData) 544 DWORD WIN32API GetFontData(HDC hdc, DWORD dwTable, 545 DWORD dwOffset, 546 LPVOID lpvBuffer, 547 DWORD dbData) 557 548 { 558 549 dprintf(("GDI32: GetFontData, not implemented (GDI_ERROR)\n")); … … 563 554 //****************************************************************************** 564 555 //****************************************************************************** 565 ODINFUNCTION1(int, AddFontResourceA, 566 LPCSTR, szFont) 556 int WIN32API AddFontResourceA(LPCSTR szFont) 567 557 { 568 558 HINSTANCE hInstance; … … 579 569 //****************************************************************************** 580 570 //****************************************************************************** 581 ODINFUNCTION1(int, AddFontResourceW, 582 LPCWSTR, szFont) 571 int WIN32API AddFontResourceW(LPCWSTR szFont) 583 572 { 584 573 char *astring = UnicodeToAsciiString((LPWSTR)szFont); … … 593 582 //****************************************************************************** 594 583 //****************************************************************************** 595 ODINFUNCTION1(BOOL, RemoveFontResourceA, 596 LPCSTR, arg1) 584 BOOL WIN32API RemoveFontResourceA(LPCSTR arg1) 597 585 { 598 586 dprintf(("GDI32: RemoveFontResourceA %s\n", arg1)); … … 601 589 //****************************************************************************** 602 590 //****************************************************************************** 603 ODINFUNCTION1(BOOL, RemoveFontResourceW, 604 LPCWSTR, szFont) 591 BOOL WIN32API RemoveFontResourceW(LPCWSTR szFont) 605 592 { 606 593 char *astring = UnicodeToAsciiString((LPWSTR)szFont); … … 628 615 *****************************************************************************/ 629 616 630 ODINFUNCTION4(BOOL, CreateScalableFontResourceA, 631 DWORD, fdwHidden, 632 LPCSTR, lpszFontRes, 633 LPCSTR, lpszFontFile, 634 LPCSTR, lpszCurrentPath) 617 BOOL WIN32API CreateScalableFontResourceA(DWORD fdwHidden, 618 LPCSTR lpszFontRes, 619 LPCSTR lpszFontFile, 620 LPCSTR lpszCurrentPath) 635 621 { 636 622 dprintf(("GDI32: CreateScalableFontResourceA not implemented.\n")); … … 656 642 *****************************************************************************/ 657 643 658 ODINFUNCTION4(BOOL, CreateScalableFontResourceW, 659 DWORD, fdwHidden, 660 LPCWSTR, lpszFontRes, 661 LPCWSTR, lpszFontFile, 662 LPCWSTR, lpszCurrentPath) 644 BOOL WIN32API CreateScalableFontResourceW(DWORD fdwHidden, 645 LPCWSTR lpszFontRes, 646 LPCWSTR lpszFontFile, 647 LPCWSTR lpszCurrentPath) 663 648 { 664 649 dprintf(("GDI32: CreateScalableFontResourceW not implemented.\n")); … … 683 668 *****************************************************************************/ 684 669 685 ODINFUNCTION1(DWORD, GetFontLanguageInfo, 686 HDC, hdc) 670 DWORD WIN32API GetFontLanguageInfo(HDC hdc) 687 671 { 688 672 dprintf(("GDI32: GetFontLanguageInfo(%08xh) not implemented.\n", … … 714 698 * DWORD flags determines interpretation of lpSrc 715 699 */ 716 ODINFUNCTION3(BOOL, TranslateCharsetInfo, 717 LPDWORD, lpSrc, 718 LPCHARSETINFO, lpCs, 719 DWORD, flags) 700 BOOL WIN32API TranslateCharsetInfo(LPDWORD lpSrc, LPCHARSETINFO lpCs, 701 DWORD flags) 720 702 { 721 703 int index = 0;
Note:
See TracChangeset
for help on using the changeset viewer.