Imported Upstream version 2011-02-01.1upstream/2011-02-01.1

18 files changed, 565 insertions, 76 deletions

diff --git a/src/pkg/exp/datafmt/datafmt_test.go b/src/pkg/exp/datafmt/datafmt_test.go
index f6a09f820..d7c70b21d 100644
--- a/src/pkg/exp/datafmt/datafmt_test.go
+++ b/src/pkg/exp/datafmt/datafmt_test.go
@@ -80,10 +80,10 @@ func TestCustomFormatters(t *testing.T) {
 	f = parse(t, ``, fmap1)
 	verify(t, f, `even odd even odd `, 0, 1, 2, 3)
 
-	f = parse(t, `/ =@:blank; float="#"`, fmap1)
+	f = parse(t, `/ =@:blank; float64="#"`, fmap1)
 	verify(t, f, `# # #`, 0.0, 1.0, 2.0)
 
-	f = parse(t, `float=@:nil`, fmap1)
+	f = parse(t, `float64=@:nil`, fmap1)
 	verify(t, f, ``, 0.0, 1.0, 2.0)
 
 	f = parse(t, `testing "testing"; ptr=*`, fmap2)
@@ -139,7 +139,7 @@ func TestBasicTypes(t *testing.T) {
 
 	const f = 3.141592
 	const fs = `3.141592`
-	check(t, `float  ="%g"`, fs, f)
+	check(t, `float64="%g"`, fs, f)
 	check(t, `float32="%g"`, fs, float32(f))
 	check(t, `float64="%g"`, fs, float64(f))
 }
diff --git a/src/pkg/exp/datafmt/parser.go b/src/pkg/exp/datafmt/parser.go
index a01378ea5..c6d140264 100644
--- a/src/pkg/exp/datafmt/parser.go
+++ b/src/pkg/exp/datafmt/parser.go
@@ -42,8 +42,9 @@ func (p *parser) next() {
 
 func (p *parser) init(fset *token.FileSet, filename string, src []byte) {
 	p.ErrorVector.Reset()
-	p.file = p.scanner.Init(fset, filename, src, p, scanner.AllowIllegalChars) // return '@' as token.ILLEGAL w/o error message
-	p.next()                                                                   // initializes pos, tok, lit
+	p.file = fset.AddFile(filename, fset.Base(), len(src))
+	p.scanner.Init(p.file, src, p, scanner.AllowIllegalChars) // return '@' as token.ILLEGAL w/o error message
+	p.next()                                                  // initializes pos, tok, lit
 	p.packs = make(map[string]string)
 	p.rules = make(map[string]expr)
 }
diff --git a/src/pkg/exp/draw/x11/conn.go b/src/pkg/exp/draw/x11/conn.go
index da2181536..e28fb2170 100644
--- a/src/pkg/exp/draw/x11/conn.go
+++ b/src/pkg/exp/draw/x11/conn.go
@@ -122,10 +122,13 @@ func (c *conn) writeSocket() {
 func (c *conn) Screen() draw.Image { return c.img }
 
 func (c *conn) FlushImage() {
-	// We do the send (the <- operator) in an expression context, rather than in
-	// a statement context, so that it does not block, and fails if the buffered
-	// channel is full (in which case there already is a flush request pending).
-	_ = c.flush <- false
+	select {
+	case c.flush <- false:
+		// Flush notification sent.
+	default:
+		// Could not send.
+		// Flush notification must be pending already.
+	}
 }
 
 func (c *conn) Close() os.Error {
diff --git a/src/pkg/exp/eval/Makefile b/src/pkg/exp/eval/Makefile
index 2b716b14c..872316cad 100644
--- a/src/pkg/exp/eval/Makefile
+++ b/src/pkg/exp/eval/Makefile
@@ -30,7 +30,7 @@ eval: main.$O
 gen.$O: gen.go
 	$(GC) $<
 
-generate: gen.$O $(pkgdir)/$(TARG).a
+generate: gen.$O
 	$(LD) -o $@ $<;\
 	./generate > expr1.go;\
 	gofmt -w expr1.go
diff --git a/src/pkg/exp/eval/bridge.go b/src/pkg/exp/eval/bridge.go
index 3fa498d68..12835c4c0 100644
--- a/src/pkg/exp/eval/bridge.go
+++ b/src/pkg/exp/eval/bridge.go
@@ -43,8 +43,6 @@ func TypeFromNative(t reflect.Type) Type {
 			et = Float32Type
 		case reflect.Float64:
 			et = Float64Type
-		case reflect.Float:
-			et = FloatType
 		}
 	case *reflect.IntType:
 		switch t.Kind() {
diff --git a/src/pkg/exp/eval/eval_test.go b/src/pkg/exp/eval/eval_test.go
index 6bfe9089d..ff28cf1a9 100644
--- a/src/pkg/exp/eval/eval_test.go
+++ b/src/pkg/exp/eval/eval_test.go
@@ -173,8 +173,8 @@ func toValue(val interface{}) Value {
 		return &r
 	case *big.Int:
 		return &idealIntV{val}
-	case float:
-		r := floatV(val)
+	case float64:
+		r := float64V(val)
 		return &r
 	case *big.Rat:
 		return &idealFloatV{val}
@@ -244,7 +244,7 @@ func newTestWorld() *World {
 	def("i", IntType, 1)
 	def("i2", IntType, 2)
 	def("u", UintType, uint(1))
-	def("f", FloatType, 1.0)
+	def("f", Float64Type, 1.0)
 	def("s", StringType, "abc")
 	def("t", NewStructType([]StructField{{"a", IntType, false}}), vstruct{1})
 	def("ai", NewArrayType(2, IntType), varray{1, 2})
diff --git a/src/pkg/exp/eval/expr.go b/src/pkg/exp/eval/expr.go
index 70f63cf2d..e65f47617 100644
--- a/src/pkg/exp/eval/expr.go
+++ b/src/pkg/exp/eval/expr.go
@@ -1981,7 +1981,7 @@ func (a *expr) extractEffect(b *block, errOp string) (func(*Thread), *expr) {
 		case tempType.isInteger():
 			tempType = IntType
 		case tempType.isFloat():
-			tempType = FloatType
+			tempType = Float64Type
 		default:
 			log.Panicf("unexpected ideal type %v", tempType)
 		}
diff --git a/src/pkg/exp/eval/expr1.go b/src/pkg/exp/eval/expr1.go
index ae0cfc723..5d0e50000 100755
--- a/src/pkg/exp/eval/expr1.go
+++ b/src/pkg/exp/eval/expr1.go
@@ -9,8 +9,8 @@ import (
 )
 
 /*
-* "As" functions.  These retrieve evaluator functions from an
-* expr, panicking if the requested evaluator has the wrong type.
+ * "As" functions.  These retrieve evaluator functions from an
+ * expr, panicking if the requested evaluator has the wrong type.
  */
 func (a *expr) asBool() func(*Thread) bool {
 	return a.eval.(func(*Thread) bool)
@@ -90,7 +90,7 @@ func (a *expr) asInterface() func(*Thread) interface{} {
 }
 
 /*
-* Operator generators.
+ * Operator generators.
  */
 
 func (a *expr) genConstant(v Value) {
@@ -392,13 +392,6 @@ func (a *expr) genBinOpAdd(l, r *expr) {
 				ret = l + r
 				return float64(float64(ret))
 			}
-		case 0:
-			a.eval = func(t *Thread) float64 {
-				l, r := lf(t), rf(t)
-				var ret float64
-				ret = l + r
-				return float64(float(ret))
-			}
 		default:
 			log.Panicf("unexpected size %d in type %v at %v", t.Bits, t, a.pos)
 		}
@@ -528,13 +521,6 @@ func (a *expr) genBinOpSub(l, r *expr) {
 				ret = l - r
 				return float64(float64(ret))
 			}
-		case 0:
-			a.eval = func(t *Thread) float64 {
-				l, r := lf(t), rf(t)
-				var ret float64
-				ret = l - r
-				return float64(float(ret))
-			}
 		default:
 			log.Panicf("unexpected size %d in type %v at %v", t.Bits, t, a.pos)
 		}
@@ -657,13 +643,6 @@ func (a *expr) genBinOpMul(l, r *expr) {
 				ret = l * r
 				return float64(float64(ret))
 			}
-		case 0:
-			a.eval = func(t *Thread) float64 {
-				l, r := lf(t), rf(t)
-				var ret float64
-				ret = l * r
-				return float64(float(ret))
-			}
 		default:
 			log.Panicf("unexpected size %d in type %v at %v", t.Bits, t, a.pos)
 		}
@@ -822,16 +801,6 @@ func (a *expr) genBinOpQuo(l, r *expr) {
 				ret = l / r
 				return float64(float64(ret))
 			}
-		case 0:
-			a.eval = func(t *Thread) float64 {
-				l, r := lf(t), rf(t)
-				var ret float64
-				if r == 0 {
-					t.Abort(DivByZeroError{})
-				}
-				ret = l / r
-				return float64(float(ret))
-			}
 		default:
 			log.Panicf("unexpected size %d in type %v at %v", t.Bits, t, a.pos)
 		}
diff --git a/src/pkg/exp/eval/gen.go b/src/pkg/exp/eval/gen.go
index 81863dd6f..a2b119846 100644
--- a/src/pkg/exp/eval/gen.go
+++ b/src/pkg/exp/eval/gen.go
@@ -47,7 +47,7 @@ var (
 	}
 	idealIntType = &Type{Repr: "*idealIntType", Value: "IdealIntValue", Native: "*big.Int", As: "asIdealInt", IsIdeal: true}
 	floatType    = &Type{Repr: "*floatType", Value: "FloatValue", Native: "float64", As: "asFloat",
-		Sizes: []Size{{32, "float32"}, {64, "float64"}, {0, "float"}},
+		Sizes: []Size{{32, "float32"}, {64, "float64"}},
 	}
 	idealFloatType = &Type{Repr: "*idealFloatType", Value: "IdealFloatValue", Native: "*big.Rat", As: "asIdealFloat", IsIdeal: true}
 	stringType     = &Type{Repr: "*stringType", Value: "StringValue", Native: "string", As: "asString"}
diff --git a/src/pkg/exp/eval/stmt.go b/src/pkg/exp/eval/stmt.go
index b9ffa94fa..77ff066d0 100644
--- a/src/pkg/exp/eval/stmt.go
+++ b/src/pkg/exp/eval/stmt.go
@@ -602,7 +602,7 @@ func (a *stmtCompiler) doAssign(lhs []ast.Expr, rhs []ast.Expr, tok token.Token,
 				case ac.rmt.Elems[i].isInteger():
 					lt = IntType
 				case ac.rmt.Elems[i].isFloat():
-					lt = FloatType
+					lt = Float64Type
 				default:
 					log.Panicf("unexpected ideal type %v", rs[i].t)
 				}
diff --git a/src/pkg/exp/eval/type.go b/src/pkg/exp/eval/type.go
index db77ab198..3f272ce4b 100644
--- a/src/pkg/exp/eval/type.go
+++ b/src/pkg/exp/eval/type.go
@@ -372,7 +372,6 @@ type floatType struct {
 var (
 	Float32Type = universe.DefineType("float32", universePos, &floatType{commonType{}, 32, "float32"})
 	Float64Type = universe.DefineType("float64", universePos, &floatType{commonType{}, 64, "float64"})
-	FloatType   = universe.DefineType("float", universePos, &floatType{commonType{}, 0, "float"})
 )
 
 func (t *floatType) compat(o Type, conv bool) bool {
@@ -394,9 +393,6 @@ func (t *floatType) Zero() Value {
 	case 64:
 		res := float64V(0)
 		return &res
-	case 0:
-		res := floatV(0)
-		return &res
 	}
 	panic("unexpected float bit count")
 }
@@ -408,9 +404,6 @@ var minFloat64Val *big.Rat
 
 func (t *floatType) minVal() *big.Rat {
 	bits := t.Bits
-	if bits == 0 {
-		bits = uint(8 * unsafe.Sizeof(float(0)))
-	}
 	switch bits {
 	case 32:
 		return minFloat32Val
@@ -423,9 +416,6 @@ func (t *floatType) minVal() *big.Rat {
 
 func (t *floatType) maxVal() *big.Rat {
 	bits := t.Bits
-	if bits == 0 {
-		bits = uint(8 * unsafe.Sizeof(float(0)))
-	}
 	switch bits {
 	case 32:
 		return maxFloat32Val
diff --git a/src/pkg/exp/eval/value.go b/src/pkg/exp/eval/value.go
index cace2fd37..daa691897 100644
--- a/src/pkg/exp/eval/value.go
+++ b/src/pkg/exp/eval/value.go
@@ -307,16 +307,6 @@ func (v *float64V) Get(*Thread) float64 { return float64(*v) }
 
 func (v *float64V) Set(t *Thread, x float64) { *v = float64V(x) }
 
-type floatV float
-
-func (v *floatV) String() string { return fmt.Sprint(*v) }
-
-func (v *floatV) Assign(t *Thread, o Value) { *v = floatV(o.(FloatValue).Get(t)) }
-
-func (v *floatV) Get(*Thread) float64 { return float64(*v) }
-
-func (v *floatV) Set(t *Thread, x float64) { *v = floatV(x) }
-
 /*
  * Ideal float
  */
diff --git a/src/pkg/exp/ogle/cmd.go b/src/pkg/exp/ogle/cmd.go
index ff137b0f8..4f67032d0 100644
--- a/src/pkg/exp/ogle/cmd.go
+++ b/src/pkg/exp/ogle/cmd.go
@@ -64,7 +64,8 @@ func Main() {
 func newScanner(input []byte) (*scanner.Scanner, *scanner.ErrorVector) {
 	sc := new(scanner.Scanner)
 	ev := new(scanner.ErrorVector)
-	sc.Init(fset, "input", input, ev, 0)
+	file := fset.AddFile("input", fset.Base(), len(input))
+	sc.Init(file, input, ev, 0)
 	return sc, ev
 }
 
diff --git a/src/pkg/exp/ogle/rtype.go b/src/pkg/exp/ogle/rtype.go
index fd77f1bc2..b3c35575a 100644
--- a/src/pkg/exp/ogle/rtype.go
+++ b/src/pkg/exp/ogle/rtype.go
@@ -209,9 +209,6 @@ func parseRemoteType(a aborter, rs remoteStruct) *remoteType {
 	case p.runtime.PFloat64Type:
 		t = eval.Float64Type
 		mk = mkFloat64
-	case p.runtime.PFloatType:
-		t = eval.FloatType
-		mk = mkFloat
 	case p.runtime.PStringType:
 		t = eval.StringType
 		mk = mkString
diff --git a/src/pkg/exp/wingui/Makefile b/src/pkg/exp/wingui/Makefile
new file mode 100644
index 000000000..e9d44d2bc
--- /dev/null
+++ b/src/pkg/exp/wingui/Makefile
@@ -0,0 +1,26 @@
+# Copyright 2011 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+GOOS=windows
+
+include ../../../Make.inc
+
+TARG=wingui
+
+GOFILES=\
+	gui.go\
+	winapi.go\
+	zwinapi.go\
+
+include ../../../Make.cmd
+
+zwinapi.go: winapi.go
+	$(GOROOT)/src/pkg/syscall/mksyscall_windows.sh $< \
+		| sed 's/^package.*syscall$$/package main/' \
+		| sed '/^import/a \
+			import "syscall"' \
+		| sed 's/Syscall/syscall.Syscall/' \
+		| sed 's/EINVAL/syscall.EINVAL/' \
+		| gofmt \
+		> $@
diff --git a/src/pkg/exp/wingui/gui.go b/src/pkg/exp/wingui/gui.go
new file mode 100644
index 000000000..41ee5b789
--- /dev/null
+++ b/src/pkg/exp/wingui/gui.go
@@ -0,0 +1,152 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"fmt"
+	"syscall"
+	"os"
+	"unsafe"
+)
+
+// some help functions
+
+func abortf(format string, a ...interface{}) {
+	fmt.Fprintf(os.Stdout, format, a...)
+	os.Exit(1)
+}
+
+func abortErrNo(funcname string, err int) {
+	abortf("%s failed: %d %s\n", funcname, err, syscall.Errstr(err))
+}
+
+// global vars
+
+var (
+	mh uint32
+	bh uint32
+)
+
+// WinProc called by windows to notify us of all windows events we might be interested in.
+func WndProc(hwnd, msg uint32, wparam, lparam int32) uintptr {
+	var rc int32
+	switch msg {
+	case WM_CREATE:
+		var e int
+		// CreateWindowEx
+		bh, e = CreateWindowEx(
+			0,
+			syscall.StringToUTF16Ptr("button"),
+			syscall.StringToUTF16Ptr("Quit"),
+			WS_CHILD|WS_VISIBLE|BS_DEFPUSHBUTTON,
+			75, 70, 140, 25,
+			hwnd, 1, mh, 0)
+		if e != 0 {
+			abortErrNo("CreateWindowEx", e)
+		}
+		fmt.Printf("button handle is %x\n", bh)
+		rc = DefWindowProc(hwnd, msg, wparam, lparam)
+	case WM_COMMAND:
+		switch uint32(lparam) {
+		case bh:
+			if ok, e := PostMessage(hwnd, WM_CLOSE, 0, 0); !ok {
+				abortErrNo("PostMessage", e)
+			}
+		default:
+			rc = DefWindowProc(hwnd, msg, wparam, lparam)
+		}
+	case WM_CLOSE:
+		DestroyWindow(hwnd)
+	case WM_DESTROY:
+		PostQuitMessage(0)
+	default:
+		rc = DefWindowProc(hwnd, msg, wparam, lparam)
+	}
+	//fmt.Printf("WndProc(0x%08x, %d, 0x%08x, 0x%08x) (%d)\n", hwnd, msg, wparam, lparam, rc)
+	return uintptr(rc)
+}
+
+func rungui() int {
+	var e int
+
+	// GetModuleHandle
+	mh, e = GetModuleHandle(nil)
+	if e != 0 {
+		abortErrNo("GetModuleHandle", e)
+	}
+
+	// Get icon we're going to use.
+	myicon, e := LoadIcon(0, IDI_APPLICATION)
+	if e != 0 {
+		abortErrNo("LoadIcon", e)
+	}
+
+	// Get cursor we're going to use.
+	mycursor, e := LoadCursor(0, IDC_ARROW)
+	if e != 0 {
+		abortErrNo("LoadCursor", e)
+	}
+
+	// Create callback
+	wproc := syscall.NewCallback(WndProc)
+
+	// RegisterClassEx
+	wcname := syscall.StringToUTF16Ptr("myWindowClass")
+	var wc Wndclassex
+	wc.Size = uint32(unsafe.Sizeof(wc))
+	wc.WndProc = wproc
+	wc.Instance = mh
+	wc.Icon = myicon
+	wc.Cursor = mycursor
+	wc.Background = COLOR_BTNFACE + 1
+	wc.MenuName = nil
+	wc.ClassName = wcname
+	wc.IconSm = myicon
+	if _, e := RegisterClassEx(&wc); e != 0 {
+		abortErrNo("RegisterClassEx", e)
+	}
+
+	// CreateWindowEx
+	wh, e := CreateWindowEx(
+		WS_EX_CLIENTEDGE,
+		wcname,
+		syscall.StringToUTF16Ptr("My window"),
+		WS_OVERLAPPEDWINDOW,
+		CW_USEDEFAULT, CW_USEDEFAULT, 300, 200,
+		0, 0, mh, 0)
+	if e != 0 {
+		abortErrNo("CreateWindowEx", e)
+	}
+	fmt.Printf("main window handle is %x\n", wh)
+
+	// ShowWindow
+	ShowWindow(wh, SW_SHOWDEFAULT)
+
+	// UpdateWindow
+	if _, e := UpdateWindow(wh); e != 0 {
+		abortErrNo("UpdateWindow", e)
+	}
+
+	// Process all windows messages until WM_QUIT.
+	var m Msg
+	for {
+		r, e := GetMessage(&m, 0, 0, 0)
+		if e != 0 {
+			abortErrNo("GetMessage", e)
+		}
+		if r == 0 {
+			// WM_QUIT received -> get out
+			break
+		}
+		TranslateMessage(&m)
+		DispatchMessage(&m)
+	}
+	return int(m.Wparam)
+}
+
+func main() {
+	rc := rungui()
+	os.Exit(rc)
+}
diff --git a/src/pkg/exp/wingui/winapi.go b/src/pkg/exp/wingui/winapi.go
new file mode 100644
index 000000000..2f480ec9e
--- /dev/null
+++ b/src/pkg/exp/wingui/winapi.go
@@ -0,0 +1,148 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func loadDll(fname string) uint32 {
+	h, e := syscall.LoadLibrary(fname)
+	if e != 0 {
+		abortf("LoadLibrary(%s) failed with err=%d.\n", fname, e)
+	}
+	return h
+}
+
+func getSysProcAddr(m uint32, pname string) uintptr {
+	p, e := syscall.GetProcAddress(m, pname)
+	if e != 0 {
+		abortf("GetProcAddress(%s) failed with err=%d.\n", pname, e)
+	}
+	return uintptr(p)
+}
+
+type Wndclassex struct {
+	Size       uint32
+	Style      uint32
+	WndProc    uintptr
+	ClsExtra   int32
+	WndExtra   int32
+	Instance   uint32
+	Icon       uint32
+	Cursor     uint32
+	Background uint32
+	MenuName   *uint16
+	ClassName  *uint16
+	IconSm     uint32
+}
+
+type Point struct {
+	X int32
+	Y int32
+}
+
+type Msg struct {
+	Hwnd    uint32
+	Message uint32
+	Wparam  int32
+	Lparam  int32
+	Time    uint32
+	Pt      Point
+}
+
+const (
+	// Window styles
+	WS_OVERLAPPED   = 0
+	WS_POPUP        = 0x80000000
+	WS_CHILD        = 0x40000000
+	WS_MINIMIZE     = 0x20000000
+	WS_VISIBLE      = 0x10000000
+	WS_DISABLED     = 0x8000000
+	WS_CLIPSIBLINGS = 0x4000000
+	WS_CLIPCHILDREN = 0x2000000
+	WS_MAXIMIZE     = 0x1000000
+	WS_CAPTION      = WS_BORDER | WS_DLGFRAME
+	WS_BORDER       = 0x800000
+	WS_DLGFRAME     = 0x400000
+	WS_VSCROLL      = 0x200000
+	WS_HSCROLL      = 0x100000
+	WS_SYSMENU      = 0x80000
+	WS_THICKFRAME   = 0x40000
+	WS_GROUP        = 0x20000
+	WS_TABSTOP      = 0x10000
+	WS_MINIMIZEBOX  = 0x20000
+	WS_MAXIMIZEBOX  = 0x10000
+	WS_TILED        = WS_OVERLAPPED
+	WS_ICONIC       = WS_MINIMIZE
+	WS_SIZEBOX      = WS_THICKFRAME
+	// Common Window Styles
+	WS_OVERLAPPEDWINDOW = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX
+	WS_TILEDWINDOW      = WS_OVERLAPPEDWINDOW
+	WS_POPUPWINDOW      = WS_POPUP | WS_BORDER | WS_SYSMENU
+	WS_CHILDWINDOW      = WS_CHILD
+
+	WS_EX_CLIENTEDGE = 0x200
+
+	// Some windows messages
+	WM_CREATE  = 1
+	WM_DESTROY = 2
+	WM_CLOSE   = 16
+	WM_COMMAND = 273
+
+	// Some button control styles
+	BS_DEFPUSHBUTTON = 1
+
+	// Some colour constants
+	COLOR_WINDOW  = 5
+	COLOR_BTNFACE = 15
+
+	// Default window position
+	CW_USEDEFAULT = 0x80000000 - 0x100000000
+
+	// Show window default style
+	SW_SHOWDEFAULT = 10
+)
+
+var (
+	// Some globaly known cusrors
+	IDC_ARROW = MakeIntResource(32512)
+	IDC_IBEAM = MakeIntResource(32513)
+	IDC_WAIT  = MakeIntResource(32514)
+	IDC_CROSS = MakeIntResource(32515)
+
+	// Some globaly known icons
+	IDI_APPLICATION = MakeIntResource(32512)
+	IDI_HAND        = MakeIntResource(32513)
+	IDI_QUESTION    = MakeIntResource(32514)
+	IDI_EXCLAMATION = MakeIntResource(32515)
+	IDI_ASTERISK    = MakeIntResource(32516)
+	IDI_WINLOGO     = MakeIntResource(32517)
+	IDI_WARNING     = IDI_EXCLAMATION
+	IDI_ERROR       = IDI_HAND
+	IDI_INFORMATION = IDI_ASTERISK
+)
+
+//sys	GetModuleHandle(modname *uint16) (handle uint32, errno int) = GetModuleHandleW
+//sys	RegisterClassEx(wndclass *Wndclassex) (atom uint16, errno int) = user32.RegisterClassExW
+//sys	CreateWindowEx(exstyle uint32, classname *uint16, windowname *uint16, style uint32, x int32, y int32, width int32, height int32, wndparent uint32, menu uint32, instance uint32, param uintptr) (hwnd uint32, errno int) = user32.CreateWindowExW
+//sys	DefWindowProc(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) = user32.DefWindowProcW
+//sys	DestroyWindow(hwnd uint32) (ok bool, errno int) = user32.DestroyWindow
+//sys	PostQuitMessage(exitcode int32) = user32.PostQuitMessage
+//sys	ShowWindow(hwnd uint32, cmdshow int32) (ok bool) = user32.ShowWindow
+//sys	UpdateWindow(hwnd uint32) (ok bool, errno int) = user32.UpdateWindow
+//sys	GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, errno int) [failretval==-1] = user32.GetMessageW
+//sys	TranslateMessage(msg *Msg) (ok bool) = user32.TranslateMessage
+//sys	DispatchMessage(msg *Msg) (ret int32) = user32.DispatchMessageW
+//sys	LoadIcon(instance uint32, iconname *uint16) (icon uint32, errno int) = user32.LoadIconW
+//sys	LoadCursor(instance uint32, cursorname *uint16) (cursor uint32, errno int) = user32.LoadCursorW
+//sys	SetCursor(cursor uint32) (precursor uint32, errno int) = user32.SetCursor
+//sys	SendMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) = user32.SendMessageW
+//sys	PostMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (ok bool, errno int) = user32.PostMessageW
+
+func MakeIntResource(id uint16) *uint16 {
+	return (*uint16)(unsafe.Pointer(uintptr(id)))
+}
diff --git a/src/pkg/exp/wingui/zwinapi.go b/src/pkg/exp/wingui/zwinapi.go
new file mode 100644
index 000000000..324bf1773
--- /dev/null
+++ b/src/pkg/exp/wingui/zwinapi.go
@@ -0,0 +1,214 @@
+// mksyscall_windows.sh winapi.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package main
+
+import "unsafe"
+import "syscall"
+
+var (
+	modkernel32 = loadDll("kernel32.dll")
+	moduser32   = loadDll("user32.dll")
+
+	procGetModuleHandleW = getSysProcAddr(modkernel32, "GetModuleHandleW")
+	procRegisterClassExW = getSysProcAddr(moduser32, "RegisterClassExW")
+	procCreateWindowExW  = getSysProcAddr(moduser32, "CreateWindowExW")
+	procDefWindowProcW   = getSysProcAddr(moduser32, "DefWindowProcW")
+	procDestroyWindow    = getSysProcAddr(moduser32, "DestroyWindow")
+	procPostQuitMessage  = getSysProcAddr(moduser32, "PostQuitMessage")
+	procShowWindow       = getSysProcAddr(moduser32, "ShowWindow")
+	procUpdateWindow     = getSysProcAddr(moduser32, "UpdateWindow")
+	procGetMessageW      = getSysProcAddr(moduser32, "GetMessageW")
+	procTranslateMessage = getSysProcAddr(moduser32, "TranslateMessage")
+	procDispatchMessageW = getSysProcAddr(moduser32, "DispatchMessageW")
+	procLoadIconW        = getSysProcAddr(moduser32, "LoadIconW")
+	procLoadCursorW      = getSysProcAddr(moduser32, "LoadCursorW")
+	procSetCursor        = getSysProcAddr(moduser32, "SetCursor")
+	procSendMessageW     = getSysProcAddr(moduser32, "SendMessageW")
+	procPostMessageW     = getSysProcAddr(moduser32, "PostMessageW")
+)
+
+func GetModuleHandle(modname *uint16) (handle uint32, errno int) {
+	r0, _, e1 := syscall.Syscall(procGetModuleHandleW, 1, uintptr(unsafe.Pointer(modname)), 0, 0)
+	handle = uint32(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func RegisterClassEx(wndclass *Wndclassex) (atom uint16, errno int) {
+	r0, _, e1 := syscall.Syscall(procRegisterClassExW, 1, uintptr(unsafe.Pointer(wndclass)), 0, 0)
+	atom = uint16(r0)
+	if atom == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func CreateWindowEx(exstyle uint32, classname *uint16, windowname *uint16, style uint32, x int32, y int32, width int32, height int32, wndparent uint32, menu uint32, instance uint32, param uintptr) (hwnd uint32, errno int) {
+	r0, _, e1 := syscall.Syscall12(procCreateWindowExW, 12, uintptr(exstyle), uintptr(unsafe.Pointer(classname)), uintptr(unsafe.Pointer(windowname)), uintptr(style), uintptr(x), uintptr(y), uintptr(width), uintptr(height), uintptr(wndparent), uintptr(menu), uintptr(instance), uintptr(param))
+	hwnd = uint32(r0)
+	if hwnd == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func DefWindowProc(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) {
+	r0, _, _ := syscall.Syscall6(procDefWindowProcW, 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
+	lresult = int32(r0)
+	return
+}
+
+func DestroyWindow(hwnd uint32) (ok bool, errno int) {
+	r0, _, e1 := syscall.Syscall(procDestroyWindow, 1, uintptr(hwnd), 0, 0)
+	ok = bool(r0 != 0)
+	if !ok {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func PostQuitMessage(exitcode int32) {
+	syscall.Syscall(procPostQuitMessage, 1, uintptr(exitcode), 0, 0)
+	return
+}
+
+func ShowWindow(hwnd uint32, cmdshow int32) (ok bool) {
+	r0, _, _ := syscall.Syscall(procShowWindow, 2, uintptr(hwnd), uintptr(cmdshow), 0)
+	ok = bool(r0 != 0)
+	return
+}
+
+func UpdateWindow(hwnd uint32) (ok bool, errno int) {
+	r0, _, e1 := syscall.Syscall(procUpdateWindow, 1, uintptr(hwnd), 0, 0)
+	ok = bool(r0 != 0)
+	if !ok {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func GetMessage(msg *Msg, hwnd uint32, MsgFilterMin uint32, MsgFilterMax uint32) (ret int32, errno int) {
+	r0, _, e1 := syscall.Syscall6(procGetMessageW, 4, uintptr(unsafe.Pointer(msg)), uintptr(hwnd), uintptr(MsgFilterMin), uintptr(MsgFilterMax), 0, 0)
+	ret = int32(r0)
+	if ret == -1 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func TranslateMessage(msg *Msg) (ok bool) {
+	r0, _, _ := syscall.Syscall(procTranslateMessage, 1, uintptr(unsafe.Pointer(msg)), 0, 0)
+	ok = bool(r0 != 0)
+	return
+}
+
+func DispatchMessage(msg *Msg) (ret int32) {
+	r0, _, _ := syscall.Syscall(procDispatchMessageW, 1, uintptr(unsafe.Pointer(msg)), 0, 0)
+	ret = int32(r0)
+	return
+}
+
+func LoadIcon(instance uint32, iconname *uint16) (icon uint32, errno int) {
+	r0, _, e1 := syscall.Syscall(procLoadIconW, 2, uintptr(instance), uintptr(unsafe.Pointer(iconname)), 0)
+	icon = uint32(r0)
+	if icon == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func LoadCursor(instance uint32, cursorname *uint16) (cursor uint32, errno int) {
+	r0, _, e1 := syscall.Syscall(procLoadCursorW, 2, uintptr(instance), uintptr(unsafe.Pointer(cursorname)), 0)
+	cursor = uint32(r0)
+	if cursor == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func SetCursor(cursor uint32) (precursor uint32, errno int) {
+	r0, _, e1 := syscall.Syscall(procSetCursor, 1, uintptr(cursor), 0, 0)
+	precursor = uint32(r0)
+	if precursor == 0 {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}
+
+func SendMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (lresult int32) {
+	r0, _, _ := syscall.Syscall6(procSendMessageW, 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
+	lresult = int32(r0)
+	return
+}
+
+func PostMessage(hwnd uint32, msg uint32, wparam int32, lparam int32) (ok bool, errno int) {
+	r0, _, e1 := syscall.Syscall6(procPostMessageW, 4, uintptr(hwnd), uintptr(msg), uintptr(wparam), uintptr(lparam), 0, 0)
+	ok = bool(r0 != 0)
+	if !ok {
+		if e1 != 0 {
+			errno = int(e1)
+		} else {
+			errno = syscall.EINVAL
+		}
+	} else {
+		errno = 0
+	}
+	return
+}