commit c3d87e7c6958e70c036be3778f12e94349c8f5d5
author Alexandre Julliard <julliard@winehq.org> Wed Sep 07 09:26:39 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 07 09:26:39 2005 +0000
tree d15fe1b80d5cf1822e855654fe182bfe59b22802
parent 13fc2f88d6dca5837559c22a9587d145b93ca5f9

Only access 16-bit stack if really necessary.

dlls/user/edit.c

diff --git a/dlls/user/edit.c b/dlls/user/edit.c
index 372150a..baeddb2 100644
--- a/dlls/user/edit.c
+++ b/dlls/user/edit.c
@@ -1618,7 +1618,6 @@
 {
 	STACK16FRAME* stack16 = MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved);
 	HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE );
-	HANDLE16 oldDS = stack16->ds;
 
 	if (!es->text) {
 	    CHAR *textA = NULL;
@@ -1635,6 +1634,7 @@
 		}
 		else if(es->hloc16)
 		{
+		    HANDLE16 oldDS = stack16->ds;
 		    TRACE("Synchronizing with 16-bit ANSI buffer\n");
 		    stack16->ds = hInstance;
 		    textA = MapSL(LocalLock16(es->hloc16));
@@ -1677,6 +1677,7 @@
 		MultiByteToWideChar(CP_ACP, 0, textA, countA, es->text, es->buffer_size + 1);
 		if(_16bit)
 		{
+		    HANDLE16 oldDS = stack16->ds;
 		    stack16->ds = hInstance;
 		    LocalUnlock16(es->hloc16);
 		    stack16->ds = oldDS;