From 89dfe4bea0ef29d57db26cade21924eb38402e02 Mon Sep 17 00:00:00 2001
From: Charles Forsyth <charles.forsyth@gmail.com>
Date: Sun, 14 Jun 2015 12:32:13 +0100
Subject: handle 16-bit unicode from Windows in clipboard and fs names

---
 emu/Nt/win.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'emu/Nt/win.c')

diff --git a/emu/Nt/win.c b/emu/Nt/win.c
index b6330b16..c1bccfa7 100644
--- a/emu/Nt/win.c
+++ b/emu/Nt/win.c
@@ -32,10 +32,10 @@
 #include	<draw.h>
 #include	"keyboard.h"
 #include	"cursor.h"
+#include	"r16.h"
 
 extern ulong displaychan;
 
-extern	char*	runes16toutf(char*, Rune*, int);
 extern	int	bytesperline(Rectangle, int);
 extern	int	main(int argc, char **argv);
 static	void	dprint(char*, ...);
@@ -698,12 +698,12 @@ drawcursor(Drawcursor* c)
 static char*
 clipreadunicode(HANDLE h)
 {
-	Rune *p;
+	Rune16 *p;
 	int n;
 	char *q;
 	
 	p = GlobalLock(h);
-	n = runenlen(p, runestrlen(p)+1);
+	n = rune16nlen(p, runes16len(p)+1);
 	q = malloc(n);
 	if(q != nil)
 		runes16toutf(q, p, n);
@@ -753,7 +753,7 @@ clipwrite(char *buf)
 {
 	HANDLE h;
 	char *p;
-	Rune *rp;
+	Rune16 *rp;
 	int n;
 
 	n = 0;
@@ -767,7 +767,7 @@ clipwrite(char *buf)
 		return -1;
 	}
 
-	h = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, (n+1)*sizeof(Rune));
+	h = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, (n+1)*sizeof(Rune16));
 	if(h == NULL)
 		error(Enovmem);
 	rp = GlobalLock(h);
-- 
cgit v1.2.3