From b1e4a68d193504b47082493cd078a5ffc50d25a0 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 4 Nov 1995 02:11:13 +0000
Subject: [PATCH] Fix first argument to WinLoadPointer.

---
 v7/src/microcode/os2pm.c   | 6 +++---
 v7/src/microcode/os2pm.scm | 4 ++--
 v7/src/microcode/pros2pm.c | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/v7/src/microcode/os2pm.c b/v7/src/microcode/os2pm.c
index 090a813a4..272489187 100644
--- a/v7/src/microcode/os2pm.c
+++ b/v7/src/microcode/os2pm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: os2pm.c,v 1.23 1995/11/04 01:34:55 cph Exp $
+$Id: os2pm.c,v 1.24 1995/11/04 02:10:56 cph Exp $
 
 Copyright (c) 1994-95 Massachusetts Institute of Technology
 
@@ -2387,9 +2387,9 @@ set_pointer (qid_t qid, HWND desktop, HPOINTER pointer)
 }
 
 static HPOINTER
-window_load_pointer (window_t * window, HMODULE module, ULONG id)
+window_load_pointer (qid_t qid, HWND desktop, HMODULE module, ULONG id)
 {
-  return (WinLoadPointer ((WINDOW_FRAME (window)), module, id));
+  return (WinLoadPointer (desktop, module, id));
 }
 
 static BOOL
diff --git a/v7/src/microcode/os2pm.scm b/v7/src/microcode/os2pm.scm
index a21969d0c..ae45cb1a0 100644
--- a/v7/src/microcode/os2pm.scm
+++ b/v7/src/microcode/os2pm.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: os2pm.scm,v 1.4 1995/11/04 01:35:01 cph Exp $
+$Id: os2pm.scm,v 1.5 1995/11/04 02:11:13 cph Exp $
 
 Copyright (c) 1995 Massachusetts Institute of Technology
 
@@ -1069,7 +1069,7 @@ MIT in each case. */
 
 (define-pm-procedure window_load_pointer
   (value ("HPOINTER" pointer))
-  (arguments window ("HMODULE" module) (ulong id)))
+  (arguments qid ("HWND" desktop) ("HMODULE" module) (ulong id)))
 
 (define-pm-procedure window_set_icon
   (value ("BOOL" successp))
diff --git a/v7/src/microcode/pros2pm.c b/v7/src/microcode/pros2pm.c
index ca6211382..fcb5b2b1a 100644
--- a/v7/src/microcode/pros2pm.c
+++ b/v7/src/microcode/pros2pm.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: pros2pm.c,v 1.15 1995/11/04 02:00:08 cph Exp $
+$Id: pros2pm.c,v 1.16 1995/11/04 02:11:06 cph Exp $
 
 Copyright (c) 1994-95 Massachusetts Institute of Technology
 
@@ -945,7 +945,8 @@ DEFINE_PRIMITIVE ("OS2WIN-LOAD-POINTER", Prim_OS2_window_load_pointer, 3, 3, 0)
 {
   PRIMITIVE_HEADER (3);
   PRIMITIVE_RETURN
-    (ulong_to_integer (OS2_window_load_pointer ((wid_argument (1)),
+    (ulong_to_integer (OS2_window_load_pointer (pm_qid,
+						(HWND_ARG (1)),
 						(arg_ulong_integer (2)),
 						(arg_ulong_integer (3)))));
 }
-- 
2.25.1