Changeset 16987

Timestamp:

Jul 31, 2001, 9:56:48 AM (24 years ago)

Author:

sandervl

Message:

DDE callback change for new WGSS

Location:

tags/trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• dde.cpp (modified) (24 diffs)

tags/trunk/src/user32/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.90 2001-07-30 18:09:29 sandervl Exp $
+# $Id: Makefile,v 1.91 2001-07-31 07:56:48 sandervl Exp $
 
 #
@@ -111 +111 @@
 $(ODIN32_LIB)/libuls.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
-$(ODIN32_LIB)/pmwinx.lib \
 OS2386.LIB \
 $(RTLLIB_O)

tags/trunk/src/user32/dde.cpp ¶

@@ -1 @@
-/* $Id: dde.cpp,v 1.12 2001-04-04 09:01:24 sandervl Exp $ */
+/* $Id: dde.cpp,v 1.13 2001-07-31 07:56:48 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 BOOL WIN32API DdeAbandonTransaction( DWORD arg1, HCONV arg2, DWORD  arg3)
 {
-    dprintf(("USER32:  DdeAbandonTransaction\n"));
+    dprintf(("USER32: DdeAbandonTransaction %x %x %x", arg1, arg2, arg3));
     return O32_DdeAbandonTransaction(arg1, arg2, arg3);
 }
@@ -28 +28 @@
 PBYTE WIN32API DdeAccessData(HDDEDATA arg1, PDWORD  arg2)
 {
-    dprintf(("USER32:  DdeAccessData\n"));
+    dprintf(("USER32: DdeAccessData %x %x", arg1, arg2));
     return O32_DdeAccessData(arg1, arg2);
 }
@@ -35 +35 @@
 HDDEDATA WIN32API DdeAddData( HDDEDATA arg1, PVOID arg2, DWORD arg3, DWORD  arg4)
 {
-    dprintf(("USER32:  DdeAddData"));
+    dprintf(("USER32: DdeAddData %x %x %x %x", arg1, arg2, arg3, arg4));
     return O32_DdeAddData(arg1, arg2, arg3, arg4);
 }
@@ -44 +44 @@
                                        PDWORD  arg8)
 {
-    dprintf(("USER32:  DdeClientTransaction\n"));
+    dprintf(("USER32: DdeClientTransaction %x %x %x %x %x %x %x %x", arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
 
     return O32_DdeClientTransaction(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -52 +52 @@
 int WIN32API DdeCmpStringHandles( HSZ arg1, HSZ  arg2)
 {
-
-    dprintf(("USER32:  DdeCmpStringHandles\n"));
+    dprintf(("USER32: DdeCmpStringHandles %x %x", arg1, arg2));
 
     return O32_DdeCmpStringHandles(arg1, arg2);
@@ -73 +72 @@
 {
 
-    dprintf(("USER32:  DdeConnectList\n"));
+    dprintf(("USER32: DdeConnectList %x %x %x %x %x", arg1, arg2, arg3, arg4, arg5));
 
     return O32_DdeConnectList(arg1, arg2, arg3, arg4, arg5);
@@ -82 +81 @@
                                       HSZ arg5, UINT arg6, UINT  arg7)
 {
-    dprintf(("USER32:  DdeCreateDataHandle\n"));
+    dprintf(("USER32: DdeCreateDataHandle %x %x %x %x %x %x %x", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
     return O32_DdeCreateDataHandle(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
@@ -111 +110 @@
 BOOL WIN32API DdeDisconnect(HCONV arg1)
 {
-
-    dprintf(("USER32:  DdeDisconnect\n"));
+    dprintf(("USER32: DdeDisconnect %x", arg1));
 
     return O32_DdeDisconnect(arg1);
@@ -120 +118 @@
 BOOL WIN32API DdeDisconnectList( HCONVLIST arg1)
 {
-
-    dprintf(("USER32:  DdeDisconnectList\n"));
+    dprintf(("USER32: DdeDisconnectList %x", arg1));
 
     return O32_DdeDisconnectList(arg1);
@@ -129 +126 @@
 BOOL WIN32API DdeEnableCallback(DWORD arg1, HCONV arg2, UINT  arg3)
 {
-
-    dprintf(("USER32:  DdeEnableCallback\n"));
+    dprintf(("USER32: DdeEnableCallback %x %x %x", arg1, arg2, arg3));
 
     return O32_DdeEnableCallback(arg1, arg2, arg3);
@@ -138 +134 @@
 BOOL WIN32API DdeFreeDataHandle( HDDEDATA arg1)
 {
-
-    dprintf(("USER32:  DdeFreeDataHandle\n"));
+    dprintf(("USER32: DdeFreeDataHandle %x", arg1));
 
     return O32_DdeFreeDataHandle(arg1);
@@ -147 +142 @@
 BOOL WIN32API DdeFreeStringHandle(DWORD arg1, HSZ  arg2)
 {
-
-    dprintf(("USER32:  DdeFreeStringHandle\n"));
+    dprintf(("USER32: DdeFreeStringHandle %x %x", arg1, arg2));
 
     return O32_DdeFreeStringHandle(arg1, arg2);
@@ -156 +150 @@
 DWORD WIN32API DdeGetData( HDDEDATA arg1, PVOID arg2, DWORD arg3, DWORD  arg4)
 {
-
-    dprintf(("USER32:  DdeGetData\n"));
+    dprintf(("USER32: DdeGetData %x %x %x %x", arg1, arg2, arg3, arg4));
 
     return O32_DdeGetData(arg1, arg2, arg3, arg4);
@@ -165 +158 @@
 UINT WIN32API DdeGetLastError(DWORD arg1)
 {
-
-    dprintf(("USER32:  DdeGetLastError\n"));
+    dprintf(("USER32: DdeGetLastError %x", arg1));
 
     return O32_DdeGetLastError(arg1);
 }
+#ifdef USING_OPEN32
 //******************************************************************************
 //******************************************************************************
@@ -180 +173 @@
    return 0;
 }
+#endif
 //******************************************************************************
 //******************************************************************************
@@ -187 +181 @@
  UINT ret;
 
-//    ret = O32_DdeInitialize(lpidInst, pfnCallback, afCmd, ulRes);
+#ifdef USING_OPEN32
     ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)DdeCallback, afCmd, ulRes);
+#else
+    ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)pfnCallback, afCmd, ulRes);
+#endif
     dprintf(("USER32: DdeInitialize %x %x %x %x returned %x", lpidInst, pfnCallback, afCmd, ulRes, ret));
     return ret;
@@ -200 +197 @@
 
     // NOTE: This will not work as is (needs UNICODE support)
+#ifdef USING_OPEN32
     ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)DdeCallback, afCmd, ulRes);
+#else
+    ret = O32_DdeInitialize(lpidInst, (PFNCALLBACK_O32)pfnCallback, afCmd, ulRes);
+#endif
     dprintf(("USER32: DdeInitializeW %x %x %x %x returned %x", lpidInst, pfnCallback, afCmd, ulRes, ret));
     return ret;
@@ -209 +210 @@
 BOOL WIN32API DdeKeepStringHandle(DWORD arg1, HSZ  arg2)
 {
-
     dprintf(("USER32:  DdeKeepStringHandle\n"));
 
@@ -218 +218 @@
 HDDEDATA WIN32API DdeNameService( DWORD arg1, HSZ  arg2, HSZ  arg3, UINT  arg4)
 {
-
     dprintf(("USER32:  DdeNameService\n"));
 
@@ -311 +310 @@
 BOOL WIN32API FreeDDElParam( UINT arg1, LONG  arg2)
 {
-
     dprintf(("USER32:  FreeDDElParam\n"));
 
@@ -320 +318 @@
 LONG WIN32API PackDDElParam(UINT arg1, UINT arg2, UINT  arg3)
 {
-
     dprintf(("USER32:  PackDDElParam\n"));
 
@@ -329 +326 @@
 UINT WIN32API ReuseDDElParam( UINT arg1, UINT arg2, UINT arg3, UINT arg4, UINT arg5)
 {
-
     dprintf(("USER32:  ReuseDDElParam\n"));
 
@@ -338 +334 @@
 BOOL WIN32API UnpackDDElParam(UINT arg1, UINT arg2, LPUINT arg3, LPUINT  arg4)
 {
-
     dprintf(("USER32:  UnpackDDElParam\n"));