Differences From Artifact [037c81af9c06936e]:
- File
src/win32/oledlg.d
- 2015-04-21 10:46:55 - part of checkin [4e2933c620] on branch trunk - Rebased to the latest verson dmd 2.067. Not yet verified the outcome. (user: kinaba) [annotate]
To Artifact [5675873348358744]:
- File
src/win32/oledlg.d
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
The problem was __gshared. Replacing it with TLS fixed the issue. Remaining problem is that "hack.d"'s CloseHandle hack is not working anymore.
(user: kinaba) [annotate]
-
2015-05-05 06:49:05
- part of checkin
[9b639cf2d6]
on branch trunk
- Working version for update to 2.067.
480 480 HRESULT GetLinkUpdateOptions(DWORD, PDWORD);
481 481 HRESULT SetLinkSource(DWORD, LPWSTR, ULONG, PULONG, BOOL);
482 482 HRESULT GetLinkSource(DWORD, LPWSTR*, PULONG, LPWSTR*, LPWSTR*, BOOL*, BOOL*);
483 483 HRESULT OpenLinkSource(DWORD);
484 484 HRESULT UpdateLink(DWORD, BOOL, BOOL);
485 485 HRESULT CancelLink(DWORD);
486 486 }
487 -alias IOleUILinkContainerW* LPOLEUILINKCONTAINERW;
487 +alias IOleUILinkContainerW LPOLEUILINKCONTAINERW;
488 488
489 489 interface IOleUILinkContainerA : IUnknown
490 490 {
491 491 HRESULT QueryInterface(REFIID, PVOID*);
492 492 ULONG AddRef();
493 493 ULONG Release();
494 494 DWORD GetNextLink(DWORD);
................................................................................
496 496 HRESULT GetLinkUpdateOptions(DWORD, PDWORD);
497 497 HRESULT SetLinkSource(DWORD, LPSTR, ULONG, PULONG, BOOL);
498 498 HRESULT GetLinkSource(DWORD, LPSTR*, PULONG, LPSTR*, LPSTR*, BOOL*, BOOL*);
499 499 HRESULT OpenLinkSource(DWORD);
500 500 HRESULT UpdateLink(DWORD, BOOL, BOOL);
501 501 HRESULT CancelLink(DWORD);
502 502 }
503 -alias IOleUILinkContainerA* LPOLEUILINKCONTAINERA;
503 +alias IOleUILinkContainerA LPOLEUILINKCONTAINERA;
504 504
505 505 struct OLEUIEDITLINKSW {
506 506 DWORD cbStruct;
507 507 DWORD dwFlags;
508 508 HWND hWndOwner;
509 509 LPCWSTR lpszCaption;
510 510 LPFNOLEUIHOOK lpfnHook;
................................................................................
538 538 LPFNOLEUIHOOK lpfnHook;
539 539 LPARAM lCustData;
540 540 HINSTANCE hInstance;
541 541 LPCWSTR lpszTemplate;
542 542 HRSRC hResource;
543 543 HGLOBAL hMetaPict;
544 544 CLSID clsid;
545 - WCHAR szIconExe[MAX_PATH];
545 + WCHAR[MAX_PATH] szIconExe;
546 546 int cchIconExe;
547 547 }
548 548 alias OLEUICHANGEICONW* POLEUICHANGEICONW, LPOLEUICHANGEICONW;
549 549
550 550 struct OLEUICHANGEICONA {
551 551 DWORD cbStruct;
552 552 DWORD dwFlags;
................................................................................
555 555 LPFNOLEUIHOOK lpfnHook;
556 556 LPARAM lCustData;
557 557 HINSTANCE hInstance;
558 558 LPCSTR lpszTemplate;
559 559 HRSRC hResource;
560 560 HGLOBAL hMetaPict;
561 561 CLSID clsid;
562 - CHAR szIconExe[MAX_PATH];
562 + CHAR[MAX_PATH] szIconExe;
563 563 int cchIconExe;
564 564 }
565 565 alias OLEUICHANGEICONA* POLEUICHANGEICONA, LPOLEUICHANGEICONA;
566 566
567 567 struct OLEUICONVERTW {
568 568 DWORD cbStruct;
569 569 DWORD dwFlags;
................................................................................
653 653 LPCWSTR lpszCaption;
654 654 LPFNOLEUIHOOK lpfnHook;
655 655 LPARAM lCustData;
656 656 HINSTANCE hInstance;
657 657 LPCWSTR lpszTemplate;
658 658 HRSRC hResource;
659 659 OPENFILENAMEW* lpOFN;
660 - DWORD dwReserved1[4];
660 + DWORD[4] dwReserved1;
661 661 LPOLEUILINKCONTAINERW lpOleUILinkContainer;
662 662 DWORD dwLink;
663 663 LPWSTR lpszDisplayName;
664 664 ULONG nFileLength;
665 665 LPWSTR lpszFrom;
666 666 LPWSTR lpszTo;
667 667 }
................................................................................
674 674 LPCSTR lpszCaption;
675 675 LPFNOLEUIHOOK lpfnHook;
676 676 LPARAM lCustData;
677 677 HINSTANCE hInstance;
678 678 LPCSTR lpszTemplate;
679 679 HRSRC hResource;
680 680 OPENFILENAMEA *lpOFN;
681 - DWORD dwReserved1[4];
681 + DWORD[4] dwReserved1;
682 682 LPOLEUILINKCONTAINERA lpOleUILinkContainer;
683 683 DWORD dwLink;
684 684 LPSTR lpszDisplayName;
685 685 ULONG nFileLength;
686 686 LPSTR lpszFrom;
687 687 LPSTR lpszTo;
688 688 }
................................................................................
695 695 ULONG Release();
696 696 HRESULT GetObjectInfo(DWORD, PDWORD, LPWSTR*, LPWSTR*, LPWSTR*, LPWSTR*);
697 697 HRESULT GetConvertInfo(DWORD, CLSID*, PWORD, CLSID*, LPCLSID*, UINT*);
698 698 HRESULT ConvertObject(DWORD, REFCLSID);
699 699 HRESULT GetViewInfo(DWORD, HGLOBAL*, PDWORD, int*);
700 700 HRESULT SetViewInfo(DWORD, HGLOBAL, DWORD, int, BOOL);
701 701 }
702 -alias IOleUIObjInfoW *LPOLEUIOBJINFOW;
702 +alias IOleUIObjInfoW LPOLEUIOBJINFOW;
703 703
704 704 interface IOleUIObjInfoA : IUnknown
705 705 {
706 706 HRESULT QueryInterface(REFIID, PVOID*);
707 707 ULONG AddRef();
708 708 ULONG Release();
709 709 HRESULT GetObjectInfo(DWORD, PDWORD, LPSTR*, LPSTR*, LPSTR*, LPSTR*);
710 710 HRESULT GetConvertInfo(DWORD, CLSID*, PWORD, CLSID*, LPCLSID*, UINT*);
711 711 HRESULT ConvertObject(DWORD, REFCLSID);
712 712 HRESULT GetViewInfo(DWORD, HGLOBAL*, PDWORD, int*);
713 713 HRESULT SetViewInfo(DWORD, HGLOBAL, DWORD, int, BOOL);
714 714 }
715 -alias IOleUIObjInfoA *LPOLEUIOBJINFOA;
715 +alias IOleUIObjInfoA LPOLEUIOBJINFOA;
716 716
717 717 interface IOleUILinkInfoW : IOleUILinkContainerW
718 718 {
719 719 HRESULT QueryInterface(REFIID, PVOID*);
720 720 ULONG AddRef();
721 721 ULONG Release();
722 722 DWORD GetNextLink(DWORD);
................................................................................
725 725 HRESULT SetLinkSource(DWORD, LPWSTR, ULONG, PULONG, BOOL);
726 726 HRESULT GetLinkSource(DWORD, LPWSTR*, PULONG, LPWSTR*, LPWSTR*, BOOL*, BOOL*);
727 727 HRESULT OpenLinkSource(DWORD);
728 728 HRESULT UpdateLink(DWORD, BOOL, BOOL);
729 729 HRESULT CancelLink(DWORD);
730 730 HRESULT GetLastUpdate(DWORD, FILETIME*);
731 731 }
732 -alias IOleUILinkInfoW *LPOLEUILINKINFOW;
732 +alias IOleUILinkInfoW LPOLEUILINKINFOW;
733 733
734 734 interface IOleUILinkInfoA : IOleUILinkContainerA
735 735 {
736 736 HRESULT QueryInterface(REFIID, PVOID*);
737 737 ULONG AddRef();
738 738 ULONG Release();
739 739 DWORD GetNextLink(DWORD);
................................................................................
742 742 HRESULT SetLinkSource(DWORD, LPSTR, ULONG, PULONG, BOOL);
743 743 HRESULT GetLinkSource(DWORD, LPSTR*, PULONG, LPSTR*, LPSTR*, BOOL*, BOOL*);
744 744 HRESULT OpenLinkSource(DWORD);
745 745 HRESULT UpdateLink(DWORD, BOOL, BOOL);
746 746 HRESULT CancelLink(DWORD);
747 747 HRESULT GetLastUpdate(DWORD, FILETIME*);
748 748 }
749 -alias IOleUILinkInfoA* LPOLEUILINKINFOA;
749 +alias IOleUILinkInfoA LPOLEUILINKINFOA;
750 750
751 751 struct OLEUIGNRLPROPSW {
752 752 DWORD cbStruct;
753 753 DWORD dwFlags;
754 - DWORD dwReserved1[2];
754 + DWORD[2] dwReserved1;
755 755 LPFNOLEUIHOOK lpfnHook;
756 756 LPARAM lCustData;
757 - DWORD dwReserved2[3];
757 + DWORD[3] dwReserved2;
758 758 OLEUIOBJECTPROPSW* lpOP;
759 759 }
760 760 alias OLEUIGNRLPROPSW* POLEUIGNRLPROPSW, LPOLEUIGNRLPROPSW;
761 761
762 762 struct OLEUIGNRLPROPSA {
763 763 DWORD cbStruct;
764 764 DWORD dwFlags;
765 - DWORD dwReserved1[2];
765 + DWORD[2] dwReserved1;
766 766 LPFNOLEUIHOOK lpfnHook;
767 767 LPARAM lCustData;
768 - DWORD dwReserved2[3];
768 + DWORD[3] dwReserved2;
769 769 OLEUIOBJECTPROPSA* lpOP;
770 770 }
771 771 alias OLEUIGNRLPROPSA* POLEUIGNRLPROPSA, LPOLEUIGNRLPROPSA;
772 772
773 773 struct OLEUIVIEWPROPSW {
774 774 DWORD cbStruct;
775 775 DWORD dwFlags;
776 - DWORD dwReserved1[2];
776 + DWORD[2] dwReserved1;
777 777 LPFNOLEUIHOOK lpfnHook;
778 778 LPARAM lCustData;
779 - DWORD dwReserved2[3];
779 + DWORD[3] dwReserved2;
780 780 OLEUIOBJECTPROPSW* lpOP;
781 781 int nScaleMin;
782 782 int nScaleMax;
783 783 }
784 784 alias OLEUIVIEWPROPSW* POLEUIVIEWPROPSW, LPOLEUIVIEWPROPSW;
785 785
786 786 struct OLEUIVIEWPROPSA {
787 787 DWORD cbStruct;
788 788 DWORD dwFlags;
789 - DWORD dwReserved1[2];
789 + DWORD[2] dwReserved1;
790 790 LPFNOLEUIHOOK lpfnHook;
791 791 LPARAM lCustData;
792 - DWORD dwReserved2[3];
792 + DWORD[3] dwReserved2;
793 793 OLEUIOBJECTPROPSA *lpOP;
794 794 int nScaleMin;
795 795 int nScaleMax;
796 796 }
797 797 alias OLEUIVIEWPROPSA* POLEUIVIEWPROPSA, LPOLEUIVIEWPROPSA;
798 798
799 799 struct OLEUILINKPROPSW {
800 800 DWORD cbStruct;
801 801 DWORD dwFlags;
802 - DWORD dwReserved1[2];
802 + DWORD[2] dwReserved1;
803 803 LPFNOLEUIHOOK lpfnHook;
804 804 LPARAM lCustData;
805 - DWORD dwReserved2[3];
805 + DWORD[3] dwReserved2;
806 806 OLEUIOBJECTPROPSW *lpOP;
807 807 }
808 808 alias OLEUILINKPROPSW* POLEUILINKPROPSW, LPOLEUILINKPROPSW;
809 809
810 810 struct OLEUILINKPROPSA {
811 811 DWORD cbStruct;
812 812 DWORD dwFlags;
813 - DWORD dwReserved1[2];
813 + DWORD[2] dwReserved1;
814 814 LPFNOLEUIHOOK lpfnHook;
815 815 LPARAM lCustData;
816 - DWORD dwReserved2[3];
816 + DWORD[3] dwReserved2;
817 817 OLEUIOBJECTPROPSA* lpOP;
818 818 }
819 819 alias OLEUILINKPROPSA* POLEUILINKPROPSA, LPOLEUILINKPROPSA;
820 820
821 821 struct OLEUIOBJECTPROPSW {
822 822 DWORD cbStruct;
823 823 DWORD dwFlags;