Merge branch 'rozmansi-master'

Author: lxn

gdi32.go

@@ -765,6 +765,10 @@ const (
 	FR_NOT_ENUM = 0x20
 )
 
+func RGB(r, g, b byte) COLORREF {
+	return COLORREF(r) | (COLORREF(g) << 8) | (COLORREF(b) << 16)
+}
+
 type (
 	COLORREF     uint32
 	HBITMAP      HGDIOBJ
@@ -776,6 +780,7 @@ type (
 	HPALETTE     HGDIOBJ
 	HPEN         HGDIOBJ
 	HRGN         HGDIOBJ
+	CLIPFORMAT   uint16
 )
 
 type PIXELFORMATDESCRIPTOR struct {

menu.go

@@ -21,27 +21,27 @@ const (
 
 // Constants for MENUITEMINFO.fType
 const (
-	MFT_BITMAP       = 4
-	MFT_MENUBARBREAK = 32
-	MFT_MENUBREAK    = 64
-	MFT_OWNERDRAW    = 256
-	MFT_RADIOCHECK   = 512
-	MFT_RIGHTJUSTIFY = 0x4000
-	MFT_SEPARATOR    = 0x800
-	MFT_RIGHTORDER   = 0x2000
-	MFT_STRING       = 0
+	MFT_STRING       = MF_STRING
+	MFT_BITMAP       = MF_BITMAP
+	MFT_MENUBARBREAK = MF_MENUBARBREAK
+	MFT_MENUBREAK    = MF_MENUBREAK
+	MFT_OWNERDRAW    = MF_OWNERDRAW
+	MFT_RADIOCHECK   = 0x00000200
+	MFT_SEPARATOR    = MF_SEPARATOR
+	MFT_RIGHTORDER   = 0x00002000
+	MFT_RIGHTJUSTIFY = MF_RIGHTJUSTIFY
 )
 
 // Constants for MENUITEMINFO.fState
 const (
-	MFS_CHECKED   = 8
-	MFS_DEFAULT   = 4096
-	MFS_DISABLED  = 3
-	MFS_ENABLED   = 0
-	MFS_GRAYED    = 3
-	MFS_HILITE    = 128
-	MFS_UNCHECKED = 0
-	MFS_UNHILITE  = 0
+	MFS_GRAYED    = 0x00000003
+	MFS_DISABLED  = MFS_GRAYED
+	MFS_CHECKED   = MF_CHECKED
+	MFS_HILITE    = MF_HILITE
+	MFS_ENABLED   = MF_ENABLED
+	MFS_UNCHECKED = MF_UNCHECKED
+	MFS_UNHILITE  = MF_UNHILITE
+	MFS_DEFAULT   = MF_DEFAULT
 )
 
 // Constants for MENUITEMINFO.hbmp*
@@ -80,8 +80,43 @@ const (
 )
 
 const (
+	// Menu flags for Add/Check/EnableMenuItem()
+	MF_INSERT = 0x00000000
+	MF_CHANGE = 0x00000080
+	MF_APPEND = 0x00000100
+	MF_DELETE = 0x00000200
+	MF_REMOVE = 0x00001000
+
 	MF_BYCOMMAND  = 0x00000000
 	MF_BYPOSITION = 0x00000400
+
+	MF_SEPARATOR = 0x00000800
+
+	MF_ENABLED  = 0x00000000
+	MF_GRAYED   = 0x00000001
+	MF_DISABLED = 0x00000002
+
+	MF_UNCHECKED       = 0x00000000
+	MF_CHECKED         = 0x00000008
+	MF_USECHECKBITMAPS = 0x00000200
+
+	MF_STRING    = 0x00000000
+	MF_BITMAP    = 0x00000004
+	MF_OWNERDRAW = 0x00000100
+
+	MF_POPUP        = 0x00000010
+	MF_MENUBARBREAK = 0x00000020
+	MF_MENUBREAK    = 0x00000040
+
+	MF_UNHILITE = 0x00000000
+	MF_HILITE   = 0x00000080
+
+	MF_DEFAULT      = 0x00001000
+	MF_SYSMENU      = 0x00002000
+	MF_HELP         = 0x00004000
+	MF_RIGHTJUSTIFY = 0x00004000
+
+	MF_MOUSESELECT = 0x00008000
 )
 
 type MENUITEMINFO struct {

oaidl.go

@@ -0,0 +1,81 @@
+// Copyright 2010 The win Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package win
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+type SCODE int32
+
+type EXCEPINFO struct {
+	wCode             uint16
+	wReserved         uint16
+	bstrSource        *uint16 /*BSTR*/
+	bstrDescription   *uint16 /*BSTR*/
+	bstrHelpFile      *uint16 /*BSTR*/
+	dwHelpContext     uint32
+	pvReserved        uintptr
+	pfnDeferredFillIn uintptr
+	scode             SCODE
+}
+
+var (
+	IID_ITypeInfo = IID{0x00020401, 0x0000, 0x0000, [8]byte{0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}
+)
+
+type ITypeInfoVtbl struct {
+	IUnknownVtbl
+	GetTypeAttr          uintptr
+	GetTypeComp          uintptr
+	GetFuncDesc          uintptr
+	GetVarDesc           uintptr
+	GetNames             uintptr
+	GetRefTypeOfImplType uintptr
+	GetImplTypeFlags     uintptr
+	GetIDsOfNames        uintptr
+	Invoke               uintptr
+	GetDocumentation     uintptr
+	GetDllEntry          uintptr
+	GetRefTypeInfo       uintptr
+	AddressOfMember      uintptr
+	CreateInstance       uintptr
+	GetMops              uintptr
+	GetContainingTypeLib uintptr
+	ReleaseTypeAttr      uintptr
+	ReleaseFuncDesc      uintptr
+	ReleaseVarDesc       uintptr
+}
+
+type ITypeInfo struct {
+	LpVtbl *ITypeInfoVtbl
+}
+
+func (obj *ITypeInfo) QueryInterface(riid REFIID, ppvObject *unsafe.Pointer) HRESULT {
+	ret, _, _ := syscall.Syscall(obj.LpVtbl.QueryInterface, 3,
+		uintptr(unsafe.Pointer(obj)),
+		uintptr(unsafe.Pointer(riid)),
+		uintptr(unsafe.Pointer(ppvObject)))
+	return HRESULT(ret)
+}
+
+func (obj *ITypeInfo) AddRef() uint32 {
+	ret, _, _ := syscall.Syscall(obj.LpVtbl.AddRef, 1,
+		uintptr(unsafe.Pointer(obj)),
+		0,
+		0)
+	return uint32(ret)
+}
+
+func (obj *ITypeInfo) Release() uint32 {
+	ret, _, _ := syscall.Syscall(obj.LpVtbl.Release, 1,
+		uintptr(unsafe.Pointer(obj)),
+		0,
+		0)
+	return uint32(ret)
+}

objidl.go

@@ -0,0 +1,47 @@
+// Copyright 2010 The win Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+
+package win
+
+type IDataObjectVtbl struct {
+	IUnknownVtbl
+	GetData               uintptr
+	GetDataHere           uintptr
+	QueryGetData          uintptr
+	GetCanonicalFormatEtc uintptr
+	SetData               uintptr
+	EnumFormatEtc         uintptr
+	DAdvise               uintptr
+	DUnadvise             uintptr
+	EnumDAdvise           uintptr
+}
+
+type IDataObject struct {
+	LpVtbl *IDataObjectVtbl
+}
+
+type IStorageVtbl struct {
+	IUnknownVtbl
+	CreateStream    uintptr
+	OpenStream      uintptr
+	CreateStorage   uintptr
+	OpenStorage     uintptr
+	CopyTo          uintptr
+	MoveElementTo   uintptr
+	Commit          uintptr
+	Revert          uintptr
+	EnumElements    uintptr
+	DestroyElement  uintptr
+	RenameElement   uintptr
+	SetElementTimes uintptr
+	SetClass        uintptr
+	SetStateBits    uintptr
+	Stat            uintptr
+}
+
+type IStorage struct {
+	LpVtbl *IStorageVtbl
+}